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

[ticket/11150] Gallery => Catalog

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-09-16 11:33:01 +02:00 • committed by Tristan Darricau
parent 963eea33a9
commit 38a58df41b
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
7 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/adm/style/acp_ext_gallery.html → phpBB/adm/style/acp_ext_catalog.html
View file

@ -2,9 +2,9 @@
<a id="maincontent"></a> <a id="maincontent"></a>
<h1>{{lang( 'EXTENSIONS_GALLERY') }}</h1> <h1>{{lang( 'EXTENSIONS_CATALOG') }}</h1>
<p>{{lang( 'EXTENSIONS_GALLERY_EXPLAIN') }}</p> <p>{{lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
{% if not enabled %} {% if not enabled %}
<div class="errorbox"> <div class="errorbox">
@ -13,7 +13,7 @@
{% endif %} {% endif %}
<fieldset class="quick quick-left"> <fieldset class="quick quick-left">
<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('gallery_settings');">{{ lang('SETTINGS') }}</a></span> <span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
</fieldset> </fieldset>
{% if pagination is defined %} {% if pagination is defined %}
@ -22,9 +22,9 @@
</div> </div>
{% endif %} {% endif %}
<form id="gallery_settings" method="post" action="{{ U_ACTION }}" style="display:none"> <form id="catalog_settings" method="post" action="{{ U_ACTION }}" style="display:none">
<fieldset style="clear: both;"> <fieldset style="clear: both;">
<legend>{{ lang('EXTENSIONS_GALLERY_SETTINGS') }}</legend> <legend>{{ lang('EXTENSIONS_CATALOG_SETTINGS') }}</legend>
<dl> <dl>
<dt><label for="enable_on_install">{{ lang('ENABLE_ON_INSTALL') }}{{ lang('COLON') }}</label></dt> <dt><label for="enable_on_install">{{ lang('ENABLE_ON_INSTALL') }}{{ lang('COLON') }}</label></dt>
<dd> <dd>
@ -66,7 +66,7 @@
<p class="submit-buttons"> <p class="submit-buttons">
<input class="button1" type="submit" name="update" value="{{ lang('SUBMIT') }}" />&nbsp; <input class="button1" type="submit" name="update" value="{{ lang('SUBMIT') }}" />&nbsp;
<input class="button2" type="reset" name="reset" value="{{ lang('RESET') }}" /> <input class="button2" type="reset" name="reset" value="{{ lang('RESET') }}" />
<input type="hidden" name="action" value="set_gallery_settings" /> <input type="hidden" name="action" value="set_catalog_settings" />
{{ S_FORM_TOKEN }} {{ S_FORM_TOKEN }}
</p> </p>
</fieldset> </fieldset>

8
phpBB/adm/style/acp_ext_list.html
View file

@ -65,8 +65,8 @@
<!-- IF enabled.META_NAME in MANAGED_EXTENSIONS --> <!-- IF enabled.META_NAME in MANAGED_EXTENSIONS -->
<!-- IF enabled.actions is defined -->&nbsp;|&nbsp;<!-- ENDIF --> <!-- IF enabled.actions is defined -->&nbsp;|&nbsp;<!-- ENDIF -->
<a href="{U_GALLERY_ACTION}&amp;action=update&amp;extension={enabled.META_NAME}">{L_UPDATE}</a> <a href="{U_CATALOG_ACTION}&amp;action=update&amp;extension={enabled.META_NAME}">{L_UPDATE}</a>
&nbsp;|&nbsp;<a href="{U_GALLERY_ACTION}&amp;action=remove&amp;extension={enabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a> &nbsp;|&nbsp;<a href="{U_CATALOG_ACTION}&amp;action=remove&amp;extension={enabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a>
<!-- ENDIF --> <!-- ENDIF -->
</td> </td>
</tr> </tr>
@ -98,8 +98,8 @@
<!-- IF disabled.META_NAME in MANAGED_EXTENSIONS --> <!-- IF disabled.META_NAME in MANAGED_EXTENSIONS -->
<!-- IF disabled.actions is defined -->&nbsp;|&nbsp;<!-- ENDIF --> <!-- IF disabled.actions is defined -->&nbsp;|&nbsp;<!-- ENDIF -->
<a href="{U_GALLERY_ACTION}&amp;action=update&amp;extension={disabled.META_NAME}">{L_UPDATE}</a> <a href="{U_CATALOG_ACTION}&amp;action=update&amp;extension={disabled.META_NAME}">{L_UPDATE}</a>
&nbsp;|&nbsp;<a href="{U_GALLERY_ACTION}&amp;action=remove&amp;extension={disabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a> &nbsp;|&nbsp;<a href="{U_CATALOG_ACTION}&amp;action=remove&amp;extension={disabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a>
<!-- ENDIF --> <!-- ENDIF -->
</td> </td>
</tr> </tr>

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

@ -60,8 +60,8 @@ class acp_extensions
switch ($mode) switch ($mode)
{ {
case 'gallery': case 'catalog':
$this->gallery_mode($id, $mode); $this->catalog_mode($id, $mode);
break; break;
default: default:
$this->main_mode($id, $mode); $this->main_mode($id, $mode);
@ -177,7 +177,7 @@ class acp_extensions
'FORCE_UNSTABLE' => $this->config['extension_force_unstable'], 'FORCE_UNSTABLE' => $this->config['extension_force_unstable'],
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
'MANAGED_EXTENSIONS' => array_keys($composer_manager->get_managed_packages()), 'MANAGED_EXTENSIONS' => array_keys($composer_manager->get_managed_packages()),
'U_GALLERY_ACTION' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=gallery"), 'U_CATALOG_ACTION' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=catalog"),
)); ));
$this->request->disable_super_globals(); $this->request->disable_super_globals();
@ -409,7 +409,7 @@ class acp_extensions
$this->tpl_name = $tpl_name; $this->tpl_name = $tpl_name;
} }
public function gallery_mode($id, $mode) public function catalog_mode($id, $mode)
{ {
global $phpbb_container; global $phpbb_container;
@ -593,7 +593,7 @@ class acp_extensions
$submit = $this->request->is_set('update'); $submit = $this->request->is_set('update');
if ($submit) if ($submit)
{ {
if (!check_form_key('gallery_settings')) if (!check_form_key('catalog_settings'))
{ {
trigger_error($language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
} }
@ -640,8 +640,8 @@ class acp_extensions
$pagination->generate_template_pagination($base_url, 'pagination', 'start', count($available_extensions), 20, $start); $pagination->generate_template_pagination($base_url, 'pagination', 'start', count($available_extensions), 20, $start);
$this->page_title = 'ACP_EXTENSIONS_GALLERY'; $this->page_title = 'ACP_EXTENSIONS_CATALOG';
$this->tpl_name = 'acp_ext_gallery'; $this->tpl_name = 'acp_ext_catalog';
$this->template->assign_var('extensions', $extensions); $this->template->assign_var('extensions', $extensions);
$this->template->assign_var('managed_extensions', array_keys($managed_packages)); $this->template->assign_var('managed_extensions', array_keys($managed_packages));
@ -655,7 +655,7 @@ class acp_extensions
]); ]);
$this->template->assign_var('enabled', $manager->check_requirements()); $this->template->assign_var('enabled', $manager->check_requirements());
add_form_key('gallery_settings'); add_form_key('catalog_settings');
break; break;
} }

2
phpBB/includes/acp/info/acp_extensions.php
View file

@ -20,7 +20,7 @@ class acp_extensions_info
'title' => 'ACP_EXTENSION_MANAGEMENT', 'title' => 'ACP_EXTENSION_MANAGEMENT',
'modes' => array( 'modes' => array(
'main' => array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')), 'main' => array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
'gallery' => array('title' => 'ACP_EXTENSIONS_GALLERY', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')), 'catalog' => array('title' => 'ACP_EXTENSIONS_CATALOG', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
), ),
); );
} }

2
phpBB/language/en/acp/common.php
View file

@ -88,7 +88,7 @@ $lang = array_merge($lang, array(
'ACP_EXTENSION_GROUPS' => 'Manage attachment extension groups', 'ACP_EXTENSION_GROUPS' => 'Manage attachment extension groups',
'ACP_EXTENSION_MANAGEMENT' => 'Extension management', 'ACP_EXTENSION_MANAGEMENT' => 'Extension management',
'ACP_EXTENSIONS' => 'Manage extensions', 'ACP_EXTENSIONS' => 'Manage extensions',
'ACP_EXTENSIONS_GALLERY' => 'Extensions gallery', 'ACP_EXTENSIONS_CATALOG' => 'Extensions catalog',
'ACP_EXTENSIONS_INSTALL' => 'Install extensions', 'ACP_EXTENSIONS_INSTALL' => 'Install extensions',
'ACP_EXTENSIONS_REMOVE' => 'Remove extensions', 'ACP_EXTENSIONS_REMOVE' => 'Remove extensions',
'ACP_EXTENSIONS_UPDATE' => 'Update extensions', 'ACP_EXTENSIONS_UPDATE' => 'Update extensions',

6
phpBB/language/en/acp/extensions.php
View file

@ -48,8 +48,8 @@ $lang = array_merge($lang, array(
'ENABLING_EXTENSIONS' => 'Enabling extensions', 'ENABLING_EXTENSIONS' => 'Enabling extensions',
'DISABLING_EXTENSIONS' => 'Disabling extensions', 'DISABLING_EXTENSIONS' => 'Disabling extensions',
'EXTENSIONS_GALLERY' => 'Extensions Gallery', 'EXTENSIONS_CATALOG' => 'Extensions Catalog',
'EXTENSIONS_GALLERY_EXPLAIN' => 'The Extensions Gallery is a tool in your phpBB Board which allows you to see all the extensions that are available for your board.', 'EXTENSIONS_CATALOG_EXPLAIN' => 'Here you can browse all of the extensions available for your phpBB board. Extensions can easily be installed or removed with just a click. Adjust the Settings to allow instant enabling and purging of extensions.',
'EXTENSION' => 'Extension', 'EXTENSION' => 'Extension',
'EXTENSIONS' => 'Extensions', 'EXTENSIONS' => 'Extensions',
@ -150,7 +150,7 @@ $lang = array_merge($lang, array(
'META_FIELD_NOT_SET' => 'Required meta field %s has not been set.', 'META_FIELD_NOT_SET' => 'Required meta field %s has not been set.',
'META_FIELD_INVALID' => 'Meta field %s is invalid.', 'META_FIELD_INVALID' => 'Meta field %s is invalid.',
'EXTENSIONS_GALLERY_SETTINGS' => 'Extensions gallery settings', 'EXTENSIONS_CATALOG_SETTINGS' => 'Extensions catalog settings',
'ENABLE_ON_INSTALL' => 'Enable extensions when installing', 'ENABLE_ON_INSTALL' => 'Enable extensions when installing',
'PURGE_ON_REMOVE' => 'Purge extensions when removing', 'PURGE_ON_REMOVE' => 'Purge extensions when removing',
'ENABLE_PACKAGIST' => 'Enable Packagist usage', 'ENABLE_PACKAGIST' => 'Enable Packagist usage',

2
phpBB/phpbb/db/migration/data/v320/extensions_composer.php
View file

@ -29,7 +29,7 @@ class extensions_composer extends \phpbb\db\migration\migration
'ACP_EXTENSION_MANAGEMENT', 'ACP_EXTENSION_MANAGEMENT',
array( array(
'module_basename' => 'acp_extensions', 'module_basename' => 'acp_extensions',
'modes' => array('gallery'), 'modes' => array('catalog'),
), ),
)), )),
); );