Merge pull request phpbb#3620 from VSEphpbb/ticket/13818

[ticket/13818] Add Extension and Style CDB Links into ACP Management pages
agothro · Jun 27, 2015 · 7b90391 · 7b90391
2 parents 7b93df1 + a620651
commit 7b90391
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 2 deletions.
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
@@ -7,7 +7,7 @@ <h1>{L_EXTENSIONS_ADMIN}</h1>
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
 	</fieldset>
 
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -97,6 +97,12 @@ <h1>{L_EXTENSIONS_ADMIN}</h1>
 	</table>
 
 	<table class="table1">
+	<tr>
+		<th>{L_EXTENSION_INSTALL_HEADLINE}</th>
+	</tr>
+	<tr>
+		<td class="row3">{L_EXTENSION_INSTALL_EXPLAIN}</td>
+	</tr>
 	<tr>
 		<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
 	</tr>

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
@@ -68,6 +68,10 @@ <h1>{L_ACP_LANGUAGE_PACKS}</h1>
 
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
+	<fieldset class="quick">
+		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.1" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
+	</fieldset>
+
 	<table class="table1 zebra-table">
 	<thead>
 	<tr>

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
@@ -19,7 +19,7 @@ <h1>{MESSAGE_TITLE}</h1>
 	{S_HIDDEN_FIELDS}
 
 	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
 		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 	</div>
 
@@ -32,6 +32,10 @@ <h1>{MESSAGE_TITLE}</h1>
 
 <!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
 
+<fieldset class="quick">
+	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.1" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
+</fieldset>
+
 <form id="acp_styles" method="post" action="{U_ACTION}">
 {S_HIDDEN_FIELDS}
 {S_FORM_TOKEN}

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
@@ -68,6 +68,12 @@
 	'EXTENSION_NAME'			=> 'Extension Name',
 	'EXTENSION_ACTIONS'			=> 'Actions',
 	'EXTENSION_OPTIONS'			=> 'Options',
+	'EXTENSION_INSTALL_HEADLINE'=> 'Installing an extension',
+	'EXTENSION_INSTALL_EXPLAIN'	=> '<ol>
+			<li>Download an extension from phpBB’s extensions database</li>
+			<li>Unzip the extension and upload it to the <samp>ext/</samp> directory of your phpBB board</li>
+			<li>Enable the extension, here in the Extensions manager</li>
+		</ol>',
 	'EXTENSION_UPDATE_HEADLINE'	=> 'Updating an extension',
 	'EXTENSION_UPDATE_EXPLAIN'	=> '<ol>
 			<li>Disable the extension</li>
@@ -119,6 +125,8 @@
 	'FORCE_UNSTABLE'					=> 'Always check for unstable versions',
 	'EXTENSIONS_VERSION_CHECK_SETTINGS'	=> 'Version check settings',
 
+	'BROWSE_EXTENSIONS_DATABASE'		=> 'Browse extensions database',
+
 	'META_FIELD_NOT_SET'	=> 'Required meta field %s has not been set.',
 	'META_FIELD_INVALID'	=> 'Meta field %s is invalid.',
 ));
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
@@ -73,4 +73,6 @@
 	'THOSE_MISSING_LANG_VARIABLES'		=> 'The following language variables are missing from the “%s” language pack',
 
 	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
+
+	'BROWSE_LANGUAGE_PACKS_DATABASE'	=> 'Browse language packs database',
 ));
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
@@ -83,4 +83,6 @@
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
 	'UNINSTALL_DEFAULT'		=> 'You cannot uninstall the default style.',
+
+	'BROWSE_STYLES_DATABASE'	=> 'Browse styles database',
 ));