From 8b8233c0da9dcf17a7faa23c004165249ee3f118 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Wed, 4 May 2022 15:08:34 +0200 Subject: [PATCH] related to #1609 Better title loading --- admin/albums.php | 12 +++++++++--- admin/themes/default/js/albums.js | 2 ++ admin/themes/default/template/albums.tpl | 4 ---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/admin/albums.php b/admin/albums.php index 7e4c048de..cd872d455 100644 --- a/admin/albums.php +++ b/admin/albums.php @@ -209,9 +209,15 @@ SELECT return $orderedTree; } -$template->assign('album_data', assocToOrderedTree($associatedTree)); -$template->assign('PWG_TOKEN', get_pwg_token()); -$template->assign('nb_albums', count($allAlbum)); +$template->assign( + array( + 'album_data' => assocToOrderedTree($associatedTree), + 'PWG_TOKEN' => get_pwg_token(), + 'nb_albums' => count($allAlbum), + 'ADMIN_PAGE_TITLE' => l10n('Albums'), + ) +); + // +-----------------------------------------------------------------------+ // | sending html code | // +-----------------------------------------------------------------------+ diff --git a/admin/themes/default/js/albums.js b/admin/themes/default/js/albums.js index 2a2844a27..df7f04403 100644 --- a/admin/themes/default/js/albums.js +++ b/admin/themes/default/js/albums.js @@ -2,6 +2,8 @@ $(document).ready(() => { formatedData = data; + $("h1").append(``+nb_albums+``); + $('.tree').tree({ data: formatedData, autoOpen : false, diff --git a/admin/themes/default/template/albums.tpl b/admin/themes/default/template/albums.tpl index 6fcb230a3..06dfa06a5 100644 --- a/admin/themes/default/template/albums.tpl +++ b/admin/themes/default/template/albums.tpl @@ -47,10 +47,6 @@ const add_sub_album_of = '{'Create a sub-album of "%s"'|@translate|escape:javasc {combine_script id='albums' load='footer' path='admin/themes/default/js/albums.js'} -
-

{'Albums'|@translate} {$nb_albums}

-
-