From b225dd37d765cc37beccb139e63432d78e0bc37e Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 27 Oct 2013 01:28:57 +0300 Subject: [PATCH 1/2] [ticket/11977] Use CSS instead of JS to disable up/down icons PHPBB3-11977 --- phpBB/adm/style/acp_forums.html | 25 ++------ phpBB/adm/style/acp_groups_position.html | 42 +++---------- phpBB/adm/style/admin.css | 8 +++ phpBB/adm/style/ajax.js | 79 ------------------------ 4 files changed, 20 insertions(+), 134 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 3fd2f18d67..d4088a9b44 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -453,19 +453,10 @@

{L_TOPICS}{L_COLON} {forums.FORUM_TOPICS} / {L_POSTS}{L_COLON} {forums.FORUM_POSTS} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - + + {ICON_MOVE_UP} + + {ICON_MOVE_DOWN} {ICON_EDIT} {ICON_SYNC} @@ -501,14 +492,6 @@ - - diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index 7aa894945a..e9858b4018 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -42,19 +42,10 @@ style="color: {legend.GROUP_COLOUR}">{legend.GROUP_NAME} {legend.GROUP_TYPE} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - + + {ICON_MOVE_UP} + + {ICON_MOVE_DOWN} {ICON_DELETE} @@ -137,19 +128,10 @@ {teampage.GROUP_TYPE}- - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - + + {ICON_MOVE_UP} + + {ICON_MOVE_DOWN} {ICON_DELETE} @@ -186,12 +168,4 @@ - - diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 0cbdc2e9f8..006cee9080 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -869,6 +869,14 @@ table td.actions { white-space: nowrap; } +table tr:first-child td.actions .up, table tr:last-child td.actions .down { + display: none; +} + +table tr:first-child td.actions .up-disabled, table tr:last-child td.actions .down-disabled { + display: inline !important; +} + table.styles td.users, table td.mark { text-align: center; } diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index efb0639f1b..78fcbd88fd 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -2,13 +2,6 @@ "use strict"; -var imgTemplates = { - up: $('.template-up-img'), - upDisabled: $('.template-up-img-disabled'), - down: $('.template-down-img'), - downDisabled: $('.template-down-img-disabled') -}; - /** * The following callbacks are for reording items. row_down * is triggered when an item is moved down, and row_up is triggered when @@ -20,43 +13,7 @@ phpbb.addAjaxCallback('row_down', function() { tr = el.parents('tr'), trSwap = tr.next(); - /* - * If the element was the first one, we have to: - * - Add the up-link to the row we moved - * - Remove the up-link on the next row - */ - if (tr.is(':first-child')) { - var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up')); - tr.find('.up').html(upImg); - - phpbb.ajaxify({ - selector: tr.find('.up').children('a'), - callback: 'row_up', - overlay: false - }); - - trSwap.find('.up').html(imgTemplates.upDisabled.clone()); - } - tr.insertAfter(trSwap); - - /* - * As well as: - * - Remove the down-link on the moved row, if it is now the last row - * - Add the down-link to the next row, if it was the last row - */ - if (tr.is(':last-child')) { - tr.find('.down').html(imgTemplates.downDisabled.clone()); - - var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down')); - trSwap.find('.down').html(downImg); - - phpbb.ajaxify({ - selector: trSwap.find('.down').children('a'), - callback: 'row_down', - overlay: false - }); - } }); phpbb.addAjaxCallback('row_up', function() { @@ -64,43 +21,7 @@ phpbb.addAjaxCallback('row_up', function() { tr = el.parents('tr'), trSwap = tr.prev(); - /* - * If the element was the last one, we have to: - * - Add the down-link to the row we moved - * - Remove the down-link on the next row - */ - if (tr.is(':last-child')) { - var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down')); - tr.find('.down').html(downImg); - - phpbb.ajaxify({ - selector: tr.find('.down').children('a'), - callback: 'row_down', - overlay: false - }); - - trSwap.find('.down').html(imgTemplates.downDisabled.clone()); - } - tr.insertBefore(trSwap); - - /* - * As well as: - * - Remove the up-link on the moved row, if it is now the first row - * - Add the up-link to the previous row, if it was the first row - */ - if (tr.is(':first-child')) { - tr.find('.up').html(imgTemplates.upDisabled.clone()); - - var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up')); - trSwap.find('.up').html(upImg); - - phpbb.ajaxify({ - selector: trSwap.find('.up').children('a'), - callback: 'row_up', - overlay: false - }); - } }); /** From a6117c51b909007456674f69cd344bf6c7f50b3d Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 3 Nov 2013 15:36:20 +0200 Subject: [PATCH 2/2] [ticket/11977] Remove data and change code in acp_modules PHPBB3-11977 --- phpBB/adm/style/acp_forums.html | 2 +- phpBB/adm/style/acp_groups_position.html | 4 ++-- phpBB/adm/style/acp_modules.html | 19 +++++-------------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index d4088a9b44..04c6ecde3a 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -444,7 +444,7 @@ - + {forums.FOLDER_IMAGE}
{forums.FORUM_IMAGE}
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index e9858b4018..a32dd1e3a7 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -38,7 +38,7 @@ - + style="color: {legend.GROUP_COLOUR}">{legend.GROUP_NAME} {legend.GROUP_TYPE} @@ -117,7 +117,7 @@ - + {teampage.GROUP_NAME} diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 1e49198725..f8be80bc57 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -149,20 +149,11 @@ {modules.MODULE_IMAGE} {modules.MODULE_TITLE} [{L_HIDDEN_MODULE}]  {L_DISABLE}{L_ENABLE}  - - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - + + + {ICON_MOVE_DOWN} + + {ICON_MOVE_DOWN} {ICON_EDIT} {ICON_DELETE}