makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'cyberalien/ticket/11977' into develop

Browse source 
* cyberalien/ticket/11977:
  [ticket/11977] Remove data and change code in acp_modules
  [ticket/11977] Use CSS instead of JS to disable up/down icons
This commit is contained in:
Joas Schilling 2013-11-03 15:08:05 +01:00
commit 478d4971a6
5 changed files with 28 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
phpBB/adm/style/acp_forums.html
View file

@ -444,7 +444,7 @@
<col class="row1" /><col class="row1" /><col class="row2" /> <col class="row1" /><col class="row1" /><col class="row2" />
<tbody> <tbody>
<!-- BEGIN forums --> <!-- BEGIN forums -->
<tr data-down="{forums.U_MOVE_DOWN}" data-up="{forums.U_MOVE_UP}"> <tr>
<td class="folder">{forums.FOLDER_IMAGE}</td> <td class="folder">{forums.FOLDER_IMAGE}</td>
<td class="forum-desc"> <td class="forum-desc">
<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF --> <!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
@ -453,19 +453,10 @@
<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF --> <!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
</td> </td>
<td class="actions"> <td class="actions">
<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW --> <span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
<span class="up">{ICON_MOVE_UP_DISABLED}</span> <span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW --> <span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_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="row_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>
<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ENDIF -->
<a href="{forums.U_EDIT}">{ICON_EDIT}</a> <a href="{forums.U_EDIT}">{ICON_EDIT}</a>
<!-- IF not forums.S_FORUM_LINK --> <!-- IF not forums.S_FORUM_LINK -->
<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a> <a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
@ -501,14 +492,6 @@
</fieldset> </fieldset>
</form> </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>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

46
phpBB/adm/style/acp_groups_position.html
View file

@ -38,23 +38,14 @@
</thead> </thead>
<tbody> <tbody>
<!-- BEGIN legend --> <!-- BEGIN legend -->
<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}"> <tr>
<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td> <td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
<td style="text-align: center;">{legend.GROUP_TYPE}</td> <td style="text-align: center;">{legend.GROUP_TYPE}</td>
<td class="actions"> <td class="actions">
<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW --> <span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
<span class="up">{ICON_MOVE_UP_DISABLED}</span> <span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW --> <span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_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>
<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ENDIF -->
<a href="{legend.U_DELETE}">{ICON_DELETE}</a> <a href="{legend.U_DELETE}">{ICON_DELETE}</a>
</td> </td>
</tr> </tr>
@ -126,7 +117,7 @@
</thead> </thead>
<tbody> <tbody>
<!-- BEGIN teampage --> <!-- BEGIN teampage -->
<tr data-down="{teampage.U_MOVE_DOWN}" data-up="{teampage.U_MOVE_UP}"> <tr>
<td> <td>
<!-- IF teampage.U_CATEGORY --> <!-- IF teampage.U_CATEGORY -->
<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a> <a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
@ -137,19 +128,10 @@
<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF --> <td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
</td></td> </td></td>
<td class="actions"> <td class="actions">
<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW --> <span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
<span class="up">{ICON_MOVE_UP_DISABLED}</span> <span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> <span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW --> <span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_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>
<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ENDIF -->
<a href="{teampage.U_DELETE}">{ICON_DELETE}</a> <a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
</td> </td>
</tr> </tr>
@ -186,12 +168,4 @@
</fieldset> </fieldset>
</form> </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 --> <!-- INCLUDE overall_footer.html -->

19
phpBB/adm/style/acp_modules.html
View file

@ -149,20 +149,11 @@
<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td> <td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td> <td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td> <td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;"> <td class="actions">
<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW --> <span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
{ICON_MOVE_UP_DISABLED} <span class="up"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW--> <span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>
<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>
{ICON_MOVE_DOWN_DISABLED}
<!-- ELSE -->
{ICON_MOVE_UP_DISABLED}
{ICON_MOVE_DOWN_DISABLED}
<!-- ENDIF -->
<a href="{modules.U_EDIT}">{ICON_EDIT}</a> <a href="{modules.U_EDIT}">{ICON_EDIT}</a>
<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
</td> </td>

8
phpBB/adm/style/admin.css
View file

@ -869,6 +869,14 @@ table td.actions {
white-space: nowrap; 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 { table.styles td.users, table td.mark {
text-align: center; text-align: center;
} }

79
phpBB/adm/style/ajax.js
View file

@ -2,13 +2,6 @@
"use strict"; "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 * The following callbacks are for reording items. row_down
* is triggered when an item is moved down, and row_up is triggered when * 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'), tr = el.parents('tr'),
trSwap = tr.next(); 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); 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() { phpbb.addAjaxCallback('row_up', function() {
@ -64,43 +21,7 @@ phpbb.addAjaxCallback('row_up', function() {
tr = el.parents('tr'), tr = el.parents('tr'),
trSwap = tr.prev(); 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); 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
});
}
}); });
/** /**