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

[ticket/10631] Various front-end fixes (extensions manager)

Browse source 
Add Back button from details

Add cancel button from actions

Correct language strings

PHPBB3-10631
This commit is contained in:
Nathan Guse 2012-07-30 19:30:49 -05:00 • committed by Unknown Bliss
parent 47898cb37a
commit dce04b2d03
5 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_ext_details.html
View file

@ -2,6 +2,8 @@
<a name="maincontent"></a> <a name="maincontent"></a>
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
<h1>{L_EXTENSIONS_ADMIN}</h1> <h1>{L_EXTENSIONS_ADMIN}</h1>
<fieldset> <fieldset>

5
phpBB/adm/style/acp_ext_disable.html
View file

@ -5,7 +5,7 @@
<h1>{L_EXTENSIONS_ADMIN}</h1> <h1>{L_EXTENSIONS_ADMIN}</h1>
<p>{L_EXTENSIONS_EXPLAIN}</p> <p>{L_EXTENSIONS_EXPLAIN}</p>
<p>{L_ENABLE_EXPLAIN}</p> <p>{L_DISABLE_EXPLAIN}</p>
<!-- IF PRE --> <!-- IF PRE -->
<div class="errorbox"> <div class="errorbox">
@ -15,7 +15,8 @@
<form id="acp_extensions" method="post" action="{U_DISABLE}"> <form id="acp_extensions" method="post" action="{U_DISABLE}">
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<legend>{L_DISABLE}</legend> <legend>{L_DISABLE}</legend>
<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" /> <input class="button1" type="submit" name="disable" value="{L_DISABLE}" />
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
</fieldset> </fieldset>
</form> </form>
<!-- ELSEIF S_NEXT_STEP --> <!-- ELSEIF S_NEXT_STEP -->

3
phpBB/adm/style/acp_ext_enable.html
View file

@ -15,7 +15,8 @@
<form id="acp_extensions" method="post" action="{U_ENABLE}"> <form id="acp_extensions" method="post" action="{U_ENABLE}">
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<legend>{L_ENABLE}</legend> <legend>{L_ENABLE}</legend>
<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" /> <input class="button1" type="submit" name="enable" value="{L_ENABLE}" />
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
</fieldset> </fieldset>
</form> </form>
<!-- ELSEIF S_NEXT_STEP --> <!-- ELSEIF S_NEXT_STEP -->

5
phpBB/adm/style/acp_ext_purge.html
View file

@ -5,7 +5,7 @@
<h1>{L_EXTENSIONS_ADMIN}</h1> <h1>{L_EXTENSIONS_ADMIN}</h1>
<p>{L_EXTENSIONS_EXPLAIN}</p> <p>{L_EXTENSIONS_EXPLAIN}</p>
<p>{L_ENABLE_EXPLAIN}</p> <p>{L_PURGE_EXPLAIN}</p>
<!-- IF PRE --> <!-- IF PRE -->
<div class="errorbox"> <div class="errorbox">
@ -15,7 +15,8 @@
<form id="acp_extensions" method="post" action="{U_PURGE}"> <form id="acp_extensions" method="post" action="{U_PURGE}">
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<legend>{L_PURGE}</legend> <legend>{L_PURGE}</legend>
<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" /> <input class="button1" type="submit" name="purge" value="{L_PURGE}" />
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
</fieldset> </fieldset>
</form> </form>
<!-- ELSEIF S_NEXT_STEP --> <!-- ELSEIF S_NEXT_STEP -->

9
phpBB/includes/acp/acp_extensions.php
View file

@ -43,6 +43,13 @@ class acp_extensions
$action = $request->variable('action', 'list'); $action = $request->variable('action', 'list');
$ext_name = $request->variable('ext_name', ''); $ext_name = $request->variable('ext_name', '');
// Cancel action
if ($request->is_set_post('cancel'))
{
$action = 'list';
$ext_name = '';
}
// If they've specificed an extension, let's load the metadata manager and validate it. // If they've specificed an extension, let's load the metadata manager and validate it.
if ($ext_name) if ($ext_name)
@ -162,6 +169,8 @@ class acp_extensions
// Output it to the template // Output it to the template
$md_manager->output_template_data(); $md_manager->output_template_data();
$template->assign_var('U_BACK', $this->u_action . '&amp;action=list');
$this->tpl_name = 'acp_ext_details'; $this->tpl_name = 'acp_ext_details';
break; break;
} }