mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

related to #1609 Renamed 'cat_move' to 'albums' and linked variables so it works with new name

Browse source
This commit is contained in:
Matthieu Leproux 2022-02-14 16:01:08 +01:00 • committed by Matthieu Leproux
parent 8dae4cb770
commit 425467e15f
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin.php
View file

@ -187,7 +187,7 @@ $template->assign(
'U_CONFIG_LANGUAGES' => $link_start.'languages', 'U_CONFIG_LANGUAGES' => $link_start.'languages',
'U_CONFIG_THEMES'=> $link_start.'themes', 'U_CONFIG_THEMES'=> $link_start.'themes',
'U_CATEGORIES'=> $link_start.'cat_list', 'U_CATEGORIES'=> $link_start.'cat_list',
'U_CAT_MOVE'=> $link_start.'cat_move', 'U_ALBUMS'=> $link_start.'albums',
'U_CAT_OPTIONS'=> $link_start.'cat_options', 'U_CAT_OPTIONS'=> $link_start.'cat_options',
'U_CAT_SEARCH'=> $link_start.'cat_search', 'U_CAT_SEARCH'=> $link_start.'cat_search',
'U_CAT_UPDATE'=> $link_start.'site_update&site=1', 'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
@ -300,7 +300,7 @@ if (
or ( !empty($_POST) and in_array($page['page'], or ( !empty($_POST) and in_array($page['page'],
array( array(
'album', // public/private; lock/unlock, permissions 'album', // public/private; lock/unlock, permissions
'cat_move', 'albums',
'cat_options', // public/private; lock/unlock 'cat_options', // public/private; lock/unlock
'user_list', // group assoc; user level 'user_list', // group assoc; user level
'user_perm', 'user_perm',

6
admin/cat_move.php → admin/albums.php
View file

@ -115,11 +115,11 @@ $template->assign('open_cat', $open_cat);
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | template initialization | // | template initialization |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
$template->set_filename('cat_move', 'cat_move.tpl'); $template->set_filename('albums', 'albums.tpl');
$template->assign( $template->assign(
array( array(
'F_ACTION' => get_root_url().'admin.php?page=cat_move', 'F_ACTION' => get_root_url().'admin.php?page=albums',
) )
); );
@ -190,7 +190,7 @@ $template->assign('PWG_TOKEN', get_pwg_token());
// | sending html code | // | sending html code |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
$template->assign_var_from_handle('ADMIN_CONTENT', 'cat_move'); $template->assign_var_from_handle('ADMIN_CONTENT', 'albums');
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | functions | // | functions |

2
admin/cat_list.php
View file

@ -324,7 +324,7 @@ foreach ($categories as $category)
'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'], 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
'U_EDIT' => $base_url.'album-'.$category['id'], 'U_EDIT' => $base_url.'album-'.$category['id'],
'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'], 'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'],
'U_MOVE' => $base_url.'cat_move#cat-'.$category['id'], 'U_MOVE' => $base_url.'albums#cat-'.$category['id'],
'IS_VIRTUAL' => empty($category['dir']) 'IS_VIRTUAL' => empty($category['dir'])
); );

2
admin/cat_modify.php
View file

@ -226,7 +226,7 @@ $template->assign(
'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'], 'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'],
'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'], 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_modify', 'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_modify',
'U_MOVE' => $base_url.'cat_move#cat-'.$category['id'], 'U_MOVE' => $base_url.'albums#cat-'.$category['id'],
'F_ACTION' => $form_action, 'F_ACTION' => $form_action,
) )

2
admin/include/functions.php
View file

@ -2699,7 +2699,7 @@ function get_active_menu($menu_page)
case 'album': case 'album':
case 'cat_list': case 'cat_list':
case 'cat_move': case 'albums':
case 'cat_options': case 'cat_options':
case 'cat_search': case 'cat_search':
case 'permalinks': case 'permalinks':

0
admin/themes/default/js/cat_move.js → admin/themes/default/js/albums.js
View file

2
admin/themes/default/template/admin.tpl
View file

@ -73,7 +73,7 @@ jQuery(document).ready(function() {
<dd> <dd>
<ul> <ul>
<li><a href="{$U_CATEGORIES}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li> <li><a href="{$U_CATEGORIES}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li>
<li><a href="{$U_CAT_MOVE}"><i class="icon-move"></i>{'Move'|@translate}</a></li> <li><a href="{$U_ALBUMS}"><i class="icon-move"></i>{'Move'|@translate}</a></li>
<li><a href="{$U_CAT_OPTIONS}"><i class="icon-pencil"></i>{'Properties'|@translate}</a></li> <li><a href="{$U_CAT_OPTIONS}"><i class="icon-pencil"></i>{'Properties'|@translate}</a></li>
</ul> </ul>
</dd> </dd>

2
admin/themes/default/template/cat_move.tpl → admin/themes/default/template/albums.tpl
View file

@ -23,7 +23,7 @@ var delay_autoOpen = {$delay_before_autoOpen}
{combine_script id='jtree' load='footer' path='themes/default/js/plugins/tree.jquery.js'} {combine_script id='jtree' load='footer' path='themes/default/js/plugins/tree.jquery.js'}
{combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *} {combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *}
{combine_script id='cat_move' load='footer' path='admin/themes/default/js/cat_move.js'} {combine_script id='albums' load='footer' path='admin/themes/default/js/albums.js'}
<div class="titrePage"> <div class="titrePage">
<h2>{'Move albums'|@translate}</h2> <h2>{'Move albums'|@translate}</h2>