diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-01 15:33:31 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-08 01:19:54 +0100 |
commit | 8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773 (patch) | |
tree | 18943ca7f5e86a2f1fecb0fbc339ed9a5a62b1c5 /phpBB/adm/style | |
parent | cc54e6a9e58cb57fad87fc5b17e3c885531bc4e6 (diff) | |
download | forums-8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773.tar forums-8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773.tar.gz forums-8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773.tar.bz2 forums-8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773.tar.xz forums-8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773.zip |
[ticket/11994] Make extension manager UI less misleading
Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.
PHPBB3-11994
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r-- | phpBB/adm/style/acp_ext_disable.html | 14 | ||||
-rw-r--r-- | phpBB/adm/style/acp_ext_enable.html | 16 | ||||
-rw-r--r-- | phpBB/adm/style/acp_ext_list.html | 10 | ||||
-rw-r--r-- | phpBB/adm/style/acp_ext_purge.html | 16 |
4 files changed, 27 insertions, 29 deletions
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html index 7dc3f6ec97..4fa0893be7 100644 --- a/phpBB/adm/style/acp_ext_disable.html +++ b/phpBB/adm/style/acp_ext_disable.html @@ -5,29 +5,29 @@ <h1>{L_EXTENSIONS_ADMIN}</h1> <p>{L_EXTENSIONS_EXPLAIN}</p> - <p>{L_DISABLE_EXPLAIN}</p> + <p>{L_EXTENSION_DISABLE_EXPLAIN}</p> <!-- IF PRE --> <div class="errorbox"> - <p>{L_DISABLE_CONFIRM}</p> + <p>{L_CONFIRM_MESSAGE}</p> </div> <form id="acp_extensions" method="post" action="{U_DISABLE}"> <fieldset class="submit-buttons"> - <legend>{L_DISABLE}</legend> - <input class="button1" type="submit" name="disable" value="{L_DISABLE}" /> + <legend>{L_EXTENSION_DISABLE}</legend> + <input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" /> <input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> </fieldset> </form> <!-- ELSEIF S_NEXT_STEP --> <div class="errorbox"> - <p>{L_DISABLE_IN_PROGRESS}</p> + <p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p> </div> <!-- ELSE --> <div class="successbox"> - <p>{L_DISABLE_SUCCESS}</p> + <p>{L_EXTENSION_DISABLE_SUCCESS}</p> <br /> - <p><a href="{U_RETURN}">{L_RETURN}</a></p> + <p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> </div> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html index 35585207eb..2a8c638b1d 100644 --- a/phpBB/adm/style/acp_ext_enable.html +++ b/phpBB/adm/style/acp_ext_enable.html @@ -5,35 +5,35 @@ <h1>{L_EXTENSIONS_ADMIN}</h1> <p>{L_EXTENSIONS_EXPLAIN}</p> - <p>{L_ENABLE_EXPLAIN}</p> + <p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_EXPLAIN}<!-- ELSE -->{L_EXTENSION_INSTALL_EXPLAIN}<!-- ENDIF --></p> <!-- IF MIGRATOR_ERROR --> <div class="errorbox"> <p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p> <p>{MIGRATOR_ERROR}</p> - <p><a href="{U_RETURN}">{L_RETURN}</a></p> + <p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> </div> <!-- ELSEIF PRE --> <div class="errorbox"> - <p>{L_ENABLE_CONFIRM}</p> + <p>{L_CONFIRM_MESSAGE}</p> </div> <form id="acp_extensions" method="post" action="{U_ENABLE}"> <fieldset class="submit-buttons"> - <legend>{L_ENABLE}</legend> - <input class="button1" type="submit" name="enable" value="{L_ENABLE}" /> + <legend><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE}<!-- ELSE -->{L_EXTENSION_INSTALL}<!-- ENDIF --></legend> + <input class="button1" type="submit" name="enable" value="<!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE}<!-- ELSE -->{L_EXTENSION_INSTALL}<!-- ENDIF -->" /> <input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> </fieldset> </form> <!-- ELSEIF S_NEXT_STEP --> <div class="errorbox"> - <p>{L_ENABLE_IN_PROGRESS}</p> + <p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_IN_PROGRESS}<!-- ELSE -->{L_EXTENSION_INSTALL_IN_PROGRESS}<!-- ENDIF --></p> </div> <!-- ELSE --> <div class="successbox"> - <p>{L_ENABLE_SUCCESS}</p> + <p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_SUCCESS}<!-- ELSE -->{L_EXTENSION_INSTALL_SUCCESS}<!-- ENDIF --></p> <br /> - <p><a href="{U_RETURN}">{L_RETURN}</a></p> + <p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> </div> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 390b3e79f0..8408ebe748 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -18,9 +18,7 @@ <tbody> <!-- IF .enabled --> <tr> - <td class="row3" colspan="3"> - <strong>{L_ENABLED} {L_EXTENSIONS}</strong> - </td> + <td class="row3" colspan="3"><strong>{L_EXTENSIONS_ENABLED}</strong></td> </tr> <!-- BEGIN enabled --> <tr class="ext_enabled"> @@ -28,7 +26,7 @@ <td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td> <td style="text-align: center;"> <!-- BEGIN actions --> - <a href="{enabled.actions.U_ACTION}" title="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a> + <a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a> <!-- IF not enabled.actions.S_LAST_ROW --> | <!-- ENDIF --> <!-- END actions --> </td> @@ -38,7 +36,7 @@ <!-- IF .disabled --> <tr> - <td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td> + <td class="row3" colspan="3"><strong>{L_EXTENSIONS_DISABLED}</strong></td> </tr> <!-- BEGIN disabled --> <tr class="ext_disabled"> @@ -48,7 +46,7 @@ </td> <td style="text-align: center;"> <!-- BEGIN actions --> - <a href="{disabled.actions.U_ACTION}" title="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a> + <a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a> <!-- IF not disabled.actions.S_LAST_ROW --> | <!-- ENDIF --> <!-- END actions --> </td> diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html index 94bef82ca5..310efd0e1d 100644 --- a/phpBB/adm/style/acp_ext_purge.html +++ b/phpBB/adm/style/acp_ext_purge.html @@ -5,35 +5,35 @@ <h1>{L_EXTENSIONS_ADMIN}</h1> <p>{L_EXTENSIONS_EXPLAIN}</p> - <p>{L_PURGE_EXPLAIN}</p> + <p>{L_EXTENSION_UNINSTALL_EXPLAIN}</p> <!-- IF MIGRATOR_ERROR --> <div class="errorbox"> <p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p> <p>{MIGRATOR_ERROR}</p> - <p><a href="{U_RETURN}">{L_RETURN}</a></p> + <p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> </div> <!-- ELSEIF PRE --> <div class="errorbox"> - <p>{L_PURGE_CONFIRM}</p> + <p>{L_CONFIRM_MESSAGE}</p> </div> <form id="acp_extensions" method="post" action="{U_PURGE}"> <fieldset class="submit-buttons"> - <legend>{L_PURGE}</legend> - <input class="button1" type="submit" name="purge" value="{L_PURGE}" /> + <legend>{L_EXTENSION_UNINSTALL}</legend> + <input class="button1" type="submit" name="purge" value="{L_EXTENSION_UNINSTALL}" /> <input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> </fieldset> </form> <!-- ELSEIF S_NEXT_STEP --> <div class="errorbox"> - <p>{L_PURGE_IN_PROGRESS}</p> + <p>{L_EXTENSION_UNINSTALL_IN_PROGRESS}</p> </div> <!-- ELSE --> <div class="successbox"> - <p>{L_PURGE_SUCCESS}</p> + <p>{L_EXTENSION_UNINSTALL_SUCCESS}</p> <br /> - <p><a href="{U_RETURN}">{L_RETURN}</a></p> + <p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> </div> <!-- ENDIF --> |