diff options
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/adm/images/icon_delete_disabled.gif | bin | 0 -> 249 bytes | |||
-rw-r--r-- | phpBB/adm/images/icon_down_disabled.gif | bin | 0 -> 166 bytes | |||
-rw-r--r-- | phpBB/adm/images/icon_edit_disabled.gif | bin | 0 -> 239 bytes | |||
-rw-r--r-- | phpBB/adm/images/icon_sync_disabled.gif | bin | 0 -> 246 bytes | |||
-rw-r--r-- | phpBB/adm/images/icon_up_disabled.gif | bin | 0 -> 168 bytes | |||
-rw-r--r-- | phpBB/adm/index.php | 15 | ||||
-rw-r--r-- | phpBB/adm/style/acp_bbcodes.html | 2 | ||||
-rw-r--r-- | phpBB/adm/style/acp_forums.html | 25 | ||||
-rw-r--r-- | phpBB/adm/style/acp_icons.html | 14 | ||||
-rw-r--r-- | phpBB/adm/style/acp_modules.html | 19 | ||||
-rw-r--r-- | phpBB/adm/style/acp_permission_roles.html | 23 | ||||
-rw-r--r-- | phpBB/adm/style/acp_profile.html | 27 | ||||
-rw-r--r-- | phpBB/adm/style/acp_reasons.html | 20 |
13 files changed, 109 insertions, 36 deletions
diff --git a/phpBB/adm/images/icon_delete_disabled.gif b/phpBB/adm/images/icon_delete_disabled.gif Binary files differnew file mode 100644 index 0000000000..da55bbbe44 --- /dev/null +++ b/phpBB/adm/images/icon_delete_disabled.gif diff --git a/phpBB/adm/images/icon_down_disabled.gif b/phpBB/adm/images/icon_down_disabled.gif Binary files differnew file mode 100644 index 0000000000..3ba36975b4 --- /dev/null +++ b/phpBB/adm/images/icon_down_disabled.gif diff --git a/phpBB/adm/images/icon_edit_disabled.gif b/phpBB/adm/images/icon_edit_disabled.gif Binary files differnew file mode 100644 index 0000000000..ac96b0e6dc --- /dev/null +++ b/phpBB/adm/images/icon_edit_disabled.gif diff --git a/phpBB/adm/images/icon_sync_disabled.gif b/phpBB/adm/images/icon_sync_disabled.gif Binary files differnew file mode 100644 index 0000000000..39985045c8 --- /dev/null +++ b/phpBB/adm/images/icon_sync_disabled.gif diff --git a/phpBB/adm/images/icon_up_disabled.gif b/phpBB/adm/images/icon_up_disabled.gif Binary files differnew file mode 100644 index 0000000000..2797192574 --- /dev/null +++ b/phpBB/adm/images/icon_up_disabled.gif diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 336afc0de1..e84e1c5e36 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -136,11 +136,16 @@ function adm_page_header($page_title) 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", - 'ICON_MOVE_UP' => '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', - 'ICON_MOVE_DOWN' => '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', - 'ICON_EDIT' => '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', - 'ICON_DELETE' => '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', - 'ICON_SYNC' => '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', + 'ICON_MOVE_UP' => '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', + 'ICON_MOVE_UP_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', + 'ICON_MOVE_DOWN' => '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', + 'ICON_MOVE_DOWN_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', + 'ICON_EDIT' => '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', + 'ICON_EDIT_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', + 'ICON_DELETE' => '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', + 'ICON_DELETE_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', + 'ICON_SYNC' => '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', + 'ICON_SYNC_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 162ee18c35..c1eb7e2193 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -96,7 +96,7 @@ <!-- BEGIN bbcodes --> <!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="text-align: center;">{bbcodes.BBCODE_TAG}</td> - <td style="text-align: center;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td> + <td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td> </tr> <!-- END bbcodes --> </tbody> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index dff974e818..24febd120d 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -313,15 +313,30 @@ <tr> <td style="width: 5%;">{forums.FOLDER_IMAGE}</td> <td> - <strong><!-- IF forums.S_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong> + <strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong> <!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF --> <!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <b>{forums.FORUM_TOPICS}</b> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF --> </td> - <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not forums.S_FIRST_ROW --><a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> - <!-- IF not forums.S_LAST_ROW --><a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;"> + <!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW --> + {ICON_MOVE_UP_DISABLED} + <a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW--> + <a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> + <a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW --> + <a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> + {ICON_MOVE_DOWN_DISABLED} + <!-- ELSE --> + {ICON_MOVE_UP_DISABLED} + {ICON_MOVE_DOWN_DISABLED} + <!-- ENDIF --> <a href="{forums.U_EDIT}">{ICON_EDIT}</a> - <!-- IF not forums.S_LINK --><a href="{forums.U_SYNC}">{ICON_SYNC}</a> <!-- ENDIF --> + <!-- IF not forums.S_FORUM_LINK --> + <a href="{forums.U_SYNC}">{ICON_SYNC}</a> + <!-- ELSE --> + {ICON_SYNC_DISABLED} + <!-- ENDIF --> <a href="{forums.U_DELETE}">{ICON_DELETE}</a> </td> </tr> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index ca4c39004a..e9d2e4823f 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -144,9 +144,17 @@ <td style="text-align: center;">{items.CODE}</td> <td style="text-align: center;">{items.EMOTION}</td> <!-- ENDIF --> - <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not items.S_FIRST_ROW --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> - <!-- IF not items.S_LAST_ROW --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <td style="width: 80px; text-align: right; white-space: nowrap;"> + <!-- IF items.S_FIRST_ROW && not items.S_LAST_ROW --> + {ICON_MOVE_UP_DISABLED} + <a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF not items.S_FIRST_ROW && not items.S_LAST_ROW--> + <a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a> + <a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF items.S_LAST_ROW && not items.S_FIRST_ROW --> + <a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a> + {ICON_MOVE_DOWN_DISABLED} + <!-- ENDIF --> <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a> </td> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 3f27c94be3..479058fd9b 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -143,11 +143,22 @@ <!-- BEGIN modules --> <tr> <td style="width: 5%;">{modules.MODULE_IMAGE}</td> - <td style="width: 50%;"><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;"> <!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF --> </td> - <td style="width: 20%; white-space: nowrap; text-align: center; vertical-align: middle;"> - <!-- IF not modules.S_FIRST_ROW --><a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> - <!-- IF not modules.S_LAST_ROW --><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <td style="width:80px; white-space: nowrap; text-align: right; vertical-align: middle;"> + <!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW --> + {ICON_MOVE_UP_DISABLED} + <a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW--> + <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_DELETE}">{ICON_DELETE}</a> </td> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 0eca7e9273..f5676b0986 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -173,10 +173,10 @@ <form id="acp_roles" method="post" action="{U_ACTION}"> <table cellspacing="1"> - <col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" /> + <col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" /> <thead> <tr> - <th style="width: 50%">{L_ROLE_NAME}</th> + <th>{L_ROLE_NAME}</th> <th colspan="2">{L_OPTIONS}</th> </tr> </thead> @@ -186,10 +186,21 @@ <td style="vertical-align: top;"><b>{roles.ROLE_NAME}</b> <!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF --> </td> - <td style="vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td> - <td style="vertical-align: top; white-space: nowrap;"> - <!-- IF not roles.S_FIRST_ROW --><a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> - <!-- IF not roles.S_LAST_ROW --><a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td> + <td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;"> + <!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW --> + {ICON_MOVE_UP_DISABLED} + <a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW--> + <a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> + <a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW --> + <a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> + {ICON_MOVE_DOWN_DISABLED} + <!-- ELSE --> + {ICON_MOVE_UP_DISABLED} + {ICON_MOVE_DOWN_DISABLED} + <!-- ENDIF --> <a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> <a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a> </td> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 5f7c87432c..9bc3111fc9 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -160,8 +160,7 @@ <tr> <th>{L_FIELD_IDENT}</th> <th>{L_FIELD_TYPE}</th> - <th> </th> - <th>{L_OPTIONS}</th> + <th colspan="2">{L_OPTIONS}</th> </tr> </thead> <tbody> @@ -170,12 +169,24 @@ <td>{fields.FIELD_IDENT}</td> <td>{fields.FIELD_TYPE}</td> - <td><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_EDIT}" style="color: red;">{L_EDIT}</a><!-- ENDIF --></td> - - <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not fields.S_FIRST_ROW --><a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> - <!-- IF not fields.S_LAST_ROW --><a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> - <!-- IF not fields.S_NEED_EDIT --><a href="{fields.U_EDIT}">{ICON_EDIT}</a> <!-- ENDIF --> + <td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_EDIT}" style="color: red;">{L_EDIT}</a><!-- ENDIF --></td> + + <td style="width: 80px; text-align: right; white-space: nowrap;"> + <!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW --> + {ICON_MOVE_UP_DISABLED} + <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW--> + <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> + <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW --> + <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> + {ICON_MOVE_DOWN_DISABLED} + <!-- ENDIF --> + <!-- IF not fields.S_NEED_EDIT --> + <a href="{fields.U_EDIT}">{ICON_EDIT}</a> + <!-- ELSE --> + {ICON_EDIT_DISABLED} + <!-- ENDIF --> <a href="{fields.U_DELETE}">{ICON_DELETE}</a> </td> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 93d23563e2..8648fb18c5 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -64,11 +64,23 @@ <br /><span>{reasons.REASON_DESCRIPTION}</span> </td> <td style="width: 100px;">{reasons.REASON_COUNT}</td> - <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not reasons.S_FIRST_ROW --><a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> - <!-- IF not reasons.S_LAST_ROW --><a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <td style="width: 80px; text-align: right; white-space: nowrap;"> + <!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW --> + {ICON_MOVE_UP_DISABLED} + <a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW--> + <a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> + <a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW --> + <a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> + {ICON_MOVE_DOWN_DISABLED} + <!-- ENDIF --> <a href="{reasons.U_EDIT}">{ICON_EDIT}</a> - <!-- IF reasons.U_DELETE --><a href="{reasons.U_DELETE}">{ICON_DELETE}</a><!-- ENDIF --> + <!-- IF reasons.U_DELETE --> + <a href="{reasons.U_DELETE}">{ICON_DELETE}</a> + <!-- ELSE --> + {ICON_DELETE_DISABLED} + <!-- ENDIF --> </td> </tr> <!-- END reasons --> |