related to #1679 fixing glitches on page titles

admin/batch_manager_global.php

@@ -476,6 +476,7 @@ $template->assign(
     'PWG_TOKEN' => get_pwg_token(),
     'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
     'F_ACTION'=>$base_url.get_query_string_diff(array('cat','start','tag','filter')),
+    'ADMIN_PAGE_TITLE' => l10n('Batch Manager'),
    )
  );
 

admin/batch_manager_unit.php

@@ -109,6 +109,7 @@ $template->assign(
     'U_ELEMENTS_PAGE' => $base_url.get_query_string_diff(array('display','start')),
     'F_ACTION' => $base_url.get_query_string_diff(array()),
     'level_options' => get_privacy_level_options(),
+    'ADMIN_PAGE_TITLE' => l10n('Batch Manager'),
     )
   );
 

admin/extend_for_templates.php

@@ -184,6 +184,7 @@ foreach ($tpl_extension as $file => $conditions)
 // +-----------------------------------------------------------------------+
 // |                           html code display                           |
 // +-----------------------------------------------------------------------+
+$template->assign('ADMIN_PAGE_TITLE', l10n('Extend for templates'));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'extend_for_templates');
 ?>

admin/history.php

@@ -113,6 +113,7 @@ $template->assign(
 $template->assign('display_thumbnails', $display_thumbnails);
 $template->assign('display_thumbnail_selected', $form['display_thumbnail']);
 $template->assign('guest_id', $conf['guest_id']);
+$template->assign('ADMIN_PAGE_TITLE', l10n('History'));
 
 // +-----------------------------------------------------------------------+
 // |                           html code display                           |

admin/languages_installed.php

@@ -116,6 +116,7 @@ DELETE
 }
 
 $template->assign('isWebmaster', (is_webmaster()) ? 1 : 0);
+$template->assign('ADMIN_PAGE_TITLE', l10n('Languages'));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'languages');
 ?>

admin/languages_new.php

@@ -108,6 +108,7 @@ else
 {
   $page['errors'][] = l10n('Can\'t connect to server.');
 }
+$template->assign('ADMIN_PAGE_TITLE', l10n('Languages'));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'languages');
 ?>

admin/menubar.php

@@ -155,6 +155,7 @@ $action = get_root_url().'admin.php?page=menubar';
 $template->assign(array('F_ACTION'=>$action));
 
 $template->assign('isWebmaster', (is_webmaster()) ? 1 : 0);
+$template->assign('ADMIN_PAGE_TITLE', l10n('Menu Management'));
 
 $template->set_filename( 'menubar_admin_content', 'menubar.tpl' );
 $template->assign_var_from_handle( 'ADMIN_CONTENT', 'menubar_admin_content');

admin/notification_by_mail.php

@@ -725,6 +725,8 @@ switch ($page['mode'])
   }
 }
 
+$template->assign('ADMIN_PAGE_TITLE', l10n('Send mail to users'));
+
 // +-----------------------------------------------------------------------+
 // | Sending html code                                                     |
 // +-----------------------------------------------------------------------+

admin/permalinks.php

@@ -181,6 +181,7 @@ $template->assign(array(
   'PWG_TOKEN' => $pwg_token,
   'U_HELP' => get_root_url().'admin/popuphelp.php?page=permalinks',
   'deleted_permalinks' => $deleted_permalinks,
+  'ADMIN_PAGE_TITLE' => l10n('Albums'),
   ));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'permalinks');

admin/photos_add_applications.php

@@ -19,5 +19,7 @@ if (!defined('PHOTOS_ADD_BASE_URL'))
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
 
+$template->assign('ADMIN_PAGE_TITLE', l10n('Upload Photos'));
+
 $template->assign_var_from_handle('ADMIN_CONTENT', 'photos_add');
 ?>

admin/photos_add_ftp.php

@@ -27,6 +27,7 @@ $template->assign(
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
+$template->assign('ADMIN_PAGE_TITLE', l10n('Upload Photos'));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'photos_add');
 ?>

admin/plugins_installed.php

@@ -194,6 +194,7 @@ $template->assign(
     'show_details' => $show_details,
     'max_inactive_before_hide' => isset($_GET['show_inactive']) ? 999 : 8,
     'isWebmaster' => (is_webmaster()) ? 1 : 0,
+    'ADMIN_PAGE_TITLE' => l10n('Plugins'),
     )
   );
 

admin/plugins_new.php

@@ -185,6 +185,7 @@ if (!$beta_test and preg_match('/(beta|RC)/', PHPWG_VERSION))
 {
   $template->assign('BETA_URL', $base_url.'&beta-test=true');
 }
+$template->assign('ADMIN_PAGE_TITLE', l10n('Plugins'));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins');
 ?>

admin/rating.php

@@ -162,7 +162,7 @@ $user_options = array(
 
 $template->assign('user_options', $user_options );
 $template->assign('user_options_selected', array(@$_GET['users']) );
-
+$template->assign('ADMIN_PAGE_TITLE', l10n('Rating'));
 
 $query = '
 SELECT i.id,

admin/rating_user.php

@@ -245,7 +245,8 @@ $template->assign( array(
   'image_urls' => $image_urls,
   'TN_WIDTH' => ImageStdParams::get_by_type(IMG_SQUARE)->sizing->ideal_size[0],
   'NB_ELEMENTS' => $nb_elements,
-  ) );
+  'ADMIN_PAGE_TITLE' => l10n('Rating'),
+  ));
 $template->set_filename('rating', 'rating_user.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'rating');
 

admin/tags.php

@@ -150,7 +150,8 @@ $template->assign(
     'first_tags' => array_slice($all_tags, 0, $per_page),
     'data' => $all_tags,
     'total' => count($all_tags),
-    'per_page' => $per_page
+    'per_page' => $per_page,
+    'ADMIN_PAGE_TITLE' => l10n('Tags'),
     )
   );
 

admin/themes/default/template/batch_manager_global.tpl

@@ -345,9 +345,6 @@ var sliders = {
 {combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *}
 
 <div id="batchManagerGlobal">
-
-<h2>{'Batch Manager'|@translate}</h2>
-
   <form action="{$F_ACTION}" method="post">
   <input type="hidden" name="start" value="{$START}">
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">

admin/themes/default/template/batch_manager_unit.tpl

@@ -35,8 +35,6 @@ jQuery("a.preview-box").colorbox( {
 }());
 {/footer_script}
 
-<h2>{'Batch Manager'|@translate}</h2>
-
 <form action="{$F_ACTION}" method="POST">
   <div style="margin: 30px 0; display: flex; justify-content: space-between;">
     <div style="margin-left: 22px;">

admin/themes/default/template/extend_for_templates.tpl

@@ -1,5 +1,3 @@
-<div class="titrePage"><h2>{'Extend for templates'|@translate}</h2>
-</div>
 {if isset($extents)}
 <h4>{'Replacement of original templates by customized templates from template-extension subfolder'|@translate}</h4>
 <form method="post" name="extend_for_templates" id="extend_for_templates" action="">

admin/themes/default/template/history.tpl

@@ -52,8 +52,6 @@ const guest_id = {$guest_id};
 {combine_script id='jquery.confirm' load='footer' require='jquery' path='themes/default/js/plugins/jquery-confirm.min.js'}
 {combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *}
 
-<h2>{'History'|@translate}</h2>
-
 <form class="filter" method="post" name="filter" action="">
 <fieldset class="history-filter">
   <div class="selectable-filter">

admin/themes/default/template/languages_installed.tpl

@@ -15,10 +15,6 @@ $(".delete-lang-button").each(function() {
 });
 {/footer_script}
 
-<div class="titrePage">
-  <h2>{'Languages'|@translate}</h2>
-</div>
-
 {foreach from=$language_states item=language_state}
 <fieldset>
   <legend>

admin/themes/default/template/languages_new.tpl

@@ -9,10 +9,6 @@ jQuery().ready(function(){ldelim}
 });
 {/footer_script}
 
-<div class="titrePage">
-  <h2>{'Languages'|@translate}</h2>
-</div>
-
 {if $isWebmaster == 1}
   
 {if !empty($languages)}

admin/themes/default/template/menubar.tpl

@@ -33,10 +33,6 @@ jQuery(document).ready(function(){
 }
 {/html_style}
 
-<div class="titrePage">
-  <h2>{'Menu Management'|@translate}</h2>
-</div>
-
 <form id="menuOrdering" action="{$F_ACTION}" method="post">
   <ul class="menuUl">
     {foreach from=$blocks item=block name="block_loop"}

admin/themes/default/template/notification_by_mail.tpl

@@ -16,10 +16,6 @@ jQuery(document).ready(function(){
 });
 {/literal}{/footer_script}
 
-<div class="titrePage">
-  <h2>{'Send mail to users'|@translate}</h2>
-</div>
-
 <form method="post" name="notification_by_mail" id="notification_by_mail" action="{$F_ACTION}">
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 

admin/themes/default/template/permalinks.tpl

@@ -1,5 +1,6 @@
-{footer_script require='jquery.ui.sortable'}{literal}
+{footer_script require='jquery.ui.sortable'}
 jQuery(document).ready(function(){
+  $("h1").append("<span class='badge-number'>{$nb_cats}</span>")
   jQuery("#addPermalinkOpen").click(function(){
     jQuery("#addPermalink").show();
     jQuery("#showAddPermalink").hide();
@@ -10,7 +11,7 @@ jQuery(document).ready(function(){
     jQuery("#showAddPermalink").show();
   });
 });
-{/literal}{/footer_script}
+{/footer_script}
 
 {literal}
 <style>
@@ -27,10 +28,6 @@ form fieldset p.actionButtons {margin-bottom:0}
 }
 {/html_style}
 
-<div class="titrePage">
-  <h2>{'Albums'|@translate}<span class='badge-number'>{$nb_cats}</span></h2>
-</div>
-
 <p id="showAddPermalink"><a href="#" id="addPermalinkOpen">{'Add/delete a permalink'|@translate}</a></p>
 
 <form method="post" action="" id="addPermalink" style="display:none">

admin/themes/default/template/photos_add_applications.tpl

@@ -68,10 +68,6 @@ jQuery().ready(function(){
 </style>
 {/literal}{/html_head}
 
-<div class="titrePage">
-  <h2>{'Upload Photos'|@translate}</h2>
-</div>
-
 <div class="applicationContainer">
 
   <div class="applicationCard"> 

admin/themes/default/template/photos_add_ftp.tpl

@@ -1,7 +1,3 @@
-<div class="titrePage">
-  <h2>{'Upload Photos'|@translate}</h2>
-</div>
-
 <div id="ftpPage">
 <p><a href="{$U_CAT_UPDATE}">{'Administration'|@translate} &raquo; {'Tools'|@translate} &raquo; {'Synchronize'|@translate}</a></p>
 

admin/themes/default/template/plugins_installed.tpl

@@ -43,10 +43,6 @@ const isWebmaster = {$isWebmaster};
 const show_details = {if $show_details} true {else} false {/if};
 {/footer_script}
 
-<div class="titrePage">
-  <h2>{'Plugins'|@translate}</h2>
-</div>
-
 {if isset($plugins)}
 
 {assign var='field_name' value='null'} {* <!-- 'counter' for fieldset management --> *}

admin/themes/default/template/plugins_new.tpl

@@ -124,7 +124,6 @@ const str_from_begining = "{"since the beginning"|@translate}";
       </div>
     </div>
   </div>
-  <h2>{'Plugins'|@translate}</h2>
 </div>
 
 {if not empty($plugins)}

admin/themes/default/template/rating.tpl

@@ -32,9 +32,12 @@ checkCatFilter();
 jQuery("select[name=cat]").change(function(){
   checkCatFilter();
 });
-{/footer_script}
 
-<h2>{'Rating'|@translate}<span class='badge-number'>{$NB_ELEMENTS}</span></h2>
+$(document).ready(function() {
+  $('h1').append("<span class='badge-number'>{$NB_ELEMENTS}</span>")
+});
+
+{/footer_script}
 
 <form action="{$F_ACTION}" method="GET" class="filter">
   <fieldset>

admin/themes/default/template/rating_user.tpl

@@ -36,8 +36,11 @@ body .ui-tooltip {
 }
 
 {/html_style}
-
+{footer_script}
-<h2>{'Rating'|@translate}<span class='badge-number'>{$NB_ELEMENTS}</span></h2>
+$(document).ready(function() {
+  $('h1').append("<span class='badge-number'>{$NB_ELEMENTS}</span>")
+});
+{/footer_script}
 
 <form action="{$F_ACTION}" method="GET">
 <fieldset>

admin/themes/default/template/tags.tpl

@@ -29,6 +29,11 @@ var str_selection_done = '{'The %d tags on this page are selected'|@translate}';
 var str_tag_selected = '{'<b>%d</b> tag selected'|@translate}';
 var str_tags_found = '{'<b>%d</b> tags found'|@translate}';
 var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
+
+$(document).ready(function() {
+  $("h1").append('<span class="badge-number">{$total}</span>');
+});
+
 {/footer_script}
 
 {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
@@ -66,10 +71,6 @@ var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
 {/function}
 {/function}
 
-<div class="titrePage">
-  <h2>{'Tags'|@translate} <span class="badge-number"> {$total}</span> </h2>
-</div>
-
 <div class="selection-mode-group-manager">
   <label class="switch">
     <input type="checkbox" id="toggleSelectionMode">

admin/themes/default/template/themes_installed.tpl

@@ -62,10 +62,6 @@ $(window).bind("load", function() {
 
 {/literal}{/footer_script}
 
-<div class="titrePage">
-  <h2>{'Themes'|@translate}</h2>
-</div>
-
 <div id="themesContent">
 
 {assign var='field_name' value='null'} {* <!-- 'counter' for fieldset management --> *}

admin/themes/default/template/themes_new.tpl

@@ -19,9 +19,6 @@ $(window).bind("load", function() {
   })
 })
 {/literal}{/footer_script}
-<div class="titrePage">
-  <h2>{'Themes'|@translate}</h2>
-</div>
 
 {if not empty($new_themes)}
 <div class="themeBoxes">

admin/themes/default/template/updates_pwg.tpl

@@ -57,10 +57,6 @@ p.release .errors {margin:0}
 </div>
 {/if}
 
-<div class="titrePage">
-<h2>{'Updates'|@translate}</h2>
-</div>
-
 {if $STEP == 0}
   {if $CHECK_VERSION}
     <p>{'You are running the latest version of Piwigo.'|@translate}</p>

admin/themes_installed.php

@@ -169,6 +169,7 @@ $template->assign(
 trigger_notify('loc_end_themes_installed');
 
 $template->assign('isWebmaster', (is_webmaster()) ? 1 : 0);
+$template->assign('ADMIN_PAGE_TITLE', l10n('Themes'));
 
 $template->set_filenames(array('themes' => 'themes_installed.tpl'));
 $template->assign_var_from_handle('ADMIN_CONTENT', 'themes');

admin/themes_new.php

@@ -118,6 +118,7 @@ else
 $template->assign('default_screenshot',
   get_root_url().'admin/themes/'.userprefs_get_param('admin_theme', 'clear').'/images/missing_screenshot.png'
 );
+$template->assign('ADMIN_PAGE_TITLE', l10n('Themes'));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'themes');
 ?>

admin/updates_pwg.php

@@ -138,6 +138,7 @@ if (isset($new_versions['major']))
   );
 }
 
+$template->assign('ADMIN_PAGE_TITLE', l10n('Updates'));
 $template->set_filename('plugin_admin_content', 'updates_pwg.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');