diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 21:47:13 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 21:47:13 -0400 |
| commit | 51cd1129bede65656a94080a8d6042190a0b8e63 (patch) | |
| tree | 057a94699e656605a4deb26b3ed91c45e93cf9b2 /phpBB | |
| parent | d5325e6934e7d469374c9e2cfe6c8c29ca5ffe4f (diff) | |
| parent | c4c95fddaa865b6639305415a6e0908bb9cd6691 (diff) | |
| download | forums-51cd1129bede65656a94080a8d6042190a0b8e63.tar forums-51cd1129bede65656a94080a8d6042190a0b8e63.tar.gz forums-51cd1129bede65656a94080a8d6042190a0b8e63.tar.bz2 forums-51cd1129bede65656a94080a8d6042190a0b8e63.tar.xz forums-51cd1129bede65656a94080a8d6042190a0b8e63.zip | |
Merge PR #890 branch 'nickvergessen/ticket/10982' into develop
* nickvergessen/ticket/10982:
[ticket/10982] Correctly check, whether data-overlay is set
[ticket/10982] Remove overlay on first up/down move of forums in ACP
[ticket/10982] Allow setting dimming control overlay also as data-overlay
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 8 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 2 |
2 files changed, 5 insertions, 5 deletions
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> diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 17e859eedc..f7d6688f68 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -383,7 +383,7 @@ phpbb.ajaxify = function(options) { return; } - if (overlay) + if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') == 'true')) { phpbb.loading_alert(); } |