diff options
| -rw-r--r-- | phpBB/adm/style/acp_groups_position.html | 48 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 18 |
2 files changed, 40 insertions, 26 deletions
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index ade3cf3e57..5532b9ea21 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -38,24 +38,24 @@ </thead> <tbody> <!-- BEGIN legend --> - <tr> + <tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}"> <td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td> <td style="text-align: center;">{legend.GROUP_TYPE}</td> <td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;"> <!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW --> - {ICON_MOVE_UP_DISABLED} - <a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <span class="up">{ICON_MOVE_UP_DISABLED}</span> + <span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW --> - <a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a> - <a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span> + <span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW --> - <a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a> - {ICON_MOVE_DOWN_DISABLED} + <span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span> + <span class="down">{ICON_MOVE_DOWN_DISABLED}</span> <!-- ELSE --> - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} + <span class="up">{ICON_MOVE_UP_DISABLED}</span> + <span class="down">{ICON_MOVE_DOWN_DISABLED}</span> <!-- ENDIF --> - <a href="{legend.U_DELETE}">{ICON_DELETE}</a> + <a href="{legend.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a> </td> </tr> <!-- BEGINELSE --> @@ -121,7 +121,7 @@ </thead> <tbody> <!-- BEGIN teampage --> - <tr> + <tr data-down="{teampage.U_MOVE_DOWN}" data-up="{teampage.U_MOVE_UP}"> <td> <!-- IF teampage.U_CATEGORY --> <a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a> @@ -133,19 +133,19 @@ </td></td> <td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;"> <!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW --> - {ICON_MOVE_UP_DISABLED} - <a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <span class="up">{ICON_MOVE_UP_DISABLED}</span> + <span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW --> - <a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a> - <a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span> + <span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW --> - <a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a> - {ICON_MOVE_DOWN_DISABLED} + <span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span> + <span class="down">{ICON_MOVE_DOWN_DISABLED}</span> <!-- ELSE --> - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} + <span class="up">{ICON_MOVE_UP_DISABLED}</span> + <span class="down">{ICON_MOVE_DOWN_DISABLED}</span> <!-- ENDIF --> - <a href="{teampage.U_DELETE}">{ICON_DELETE}</a> + <a href="{teampage.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a> </td> </tr> <!-- BEGINELSE --> @@ -176,4 +176,12 @@ </fieldset> </form> + <div class="hidden"> + <a class="template-up-img" href="#">{ICON_MOVE_UP}</a> + <span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span> + + <a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a> + <span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span> + </div> + <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index e0ce456a62..d696b99680 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -899,6 +899,12 @@ class acp_groups } } + if (($action == 'move_up' || $action == 'move_down') && $request->is_ajax()) + { + $json_response = new phpbb_json_response; + $json_response->send(array('success' => true)); + } + $sql = 'SELECT group_id, group_name, group_colour, group_type, group_legend FROM ' . GROUPS_TABLE . ' ORDER BY group_legend ASC, group_type DESC, group_name ASC'; @@ -911,13 +917,13 @@ class acp_groups if ($row['group_legend']) { $template->assign_block_vars('legend', array( - 'GROUP_NAME' => $group_name, - 'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '', - 'GROUP_TYPE' => $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])], + 'GROUP_NAME' => $group_name, + 'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '', + 'GROUP_TYPE' => $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])], - 'U_MOVE_DOWN' => "{$this->u_action}&field=legend&action=move_down&g=" . $row['group_id'], - 'U_MOVE_UP' => "{$this->u_action}&field=legend&action=move_up&g=" . $row['group_id'], - 'U_DELETE' => "{$this->u_action}&field=legend&action=delete&g=" . $row['group_id'], + 'U_MOVE_DOWN' => "{$this->u_action}&field=legend&action=move_down&g=" . $row['group_id'], + 'U_MOVE_UP' => "{$this->u_action}&field=legend&action=move_up&g=" . $row['group_id'], + 'U_DELETE' => "{$this->u_action}&field=legend&action=delete&g=" . $row['group_id'], )); } else |