issue #2439 update popin

Add translations
remove last major update conf when in piwigo Upgrade
don't send popin template if not needed
This commit is contained in:
HWFord
2025-11-17 10:00:53 +01:00
parent 56a48aa76b
commit c04374928a
6 changed files with 33 additions and 4 deletions

View File

@@ -382,6 +382,7 @@ $whats_new_imgs = array(
// '4' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-1109101f.png', // '4' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-1109101f.png',
); );
//If last major update conf is less than a month old then display bell for whats new popin
$display_bell = false; $display_bell = false;
if (strtotime($conf['last_major_update']) > strtotime('1 month ago')) if (strtotime($conf['last_major_update']) > strtotime('1 month ago'))
{ {
@@ -394,7 +395,7 @@ $template->assign(
'WHATS_NEW_MAJOR_VERSION' => $whats_new_major_version, 'WHATS_NEW_MAJOR_VERSION' => $whats_new_major_version,
'RELEASE_NOTE_URL' => $release_note_url, 'RELEASE_NOTE_URL' => $release_note_url,
'WHATS_NEW_IMGS' => $whats_new_imgs, 'WHATS_NEW_IMGS' => $whats_new_imgs,
'DISPLAY_BELL' => false, // $display_bell, 'DISPLAY_BELL' => $display_bell,
) )
); );

View File

@@ -37,6 +37,7 @@
</div>{* <!-- footer --> *} </div>{* <!-- footer --> *}
</div>{* <!-- the_page --> *} </div>{* <!-- the_page --> *}
{if (isset($SHOW_WHATS_NEW) and $SHOW_WHATS_NEW) or (isset($DISPLAY_BELL) and $DISPLAY_BELL)}
<div id="whats_new"> <div id="whats_new">
<div id="whats_new_popin"> <div id="whats_new_popin">
<a class="icon-cancel close_whats_new" onClick="hide_user_whats_new()"></a> <a class="icon-cancel close_whats_new" onClick="hide_user_whats_new()"></a>
@@ -44,17 +45,17 @@
<div> <div>
<div class="whats_new_block_container"> <div class="whats_new_block_container">
<div class="whats_new_block icon-blue whats_new_block_w_60"> <div class="whats_new_block icon-blue whats_new_block_w_60">
<h4>Brand new login & preferences with Standard pages !</h4> <h4>{'Brand new login & preferences with Standard pages !'|translate}</h4>
<a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.1}"></a> <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.1}"></a>
</div> </div>
<div class="whats_new_block icon-purple whats_new_block_w_40"> <div class="whats_new_block icon-purple whats_new_block_w_40">
<h4>Two factor authentication is here</h4> <h4>{'Two factor authentication is here'|translate}</h4>
<a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.2}"></a> <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.2}"></a>
</div> </div>
</div> </div>
<div class="whats_new_block_container"> <div class="whats_new_block_container">
<div class="whats_new_block icon-green whats_new_block_w_100"> <div class="whats_new_block icon-green whats_new_block_w_100">
<h4>UI redesigns that make a difference</h4> <h4>{'UI redesigns that make a difference'|translate}</h4>
<a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.3}"></a> <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.3}"></a>
</div> </div>
{* <div class="whats_new_block icon-yellow"> {* <div class="whats_new_block icon-yellow">
@@ -69,6 +70,7 @@
</div> </div>
</div> </div>
</div> </div>
{/if}
<style> <style>

View File

@@ -168,6 +168,7 @@ elseif ($conf['piwigo_installed_version'] != PHPWG_VERSION)
conf_update_param('piwigo_installed_version', PHPWG_VERSION); conf_update_param('piwigo_installed_version', PHPWG_VERSION);
} }
//Check if last major update conf is set if not set it
if (!isset($conf['last_major_update'])) if (!isset($conf['last_major_update']))
{ {
list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();')); list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));

View File

@@ -0,0 +1,11 @@
<?php
// +-----------------------------------------------------------------------+
// | This file is part of Piwigo. |
// | |
// | For copyright and license information, please view the COPYING.txt |
// | file that was distributed with this source code. |
// +-----------------------------------------------------------------------+
$lang['Brand new login & preferences with Standard pages !'] = 'Brand new login & preferences with Standard pages !';
$lang['Two factor authentication is here'] = 'Two factor authentication is here';
$lang['UI redesigns that make a difference'] = 'UI redesigns that make a difference';

View File

@@ -0,0 +1,11 @@
<?php
// +-----------------------------------------------------------------------+
// | This file is part of Piwigo. |
// | |
// | For copyright and license information, please view the COPYING.txt |
// | file that was distributed with this source code. |
// +-----------------------------------------------------------------------+
$lang['Brand new login & preferences with Standard pages !'] = 'Nouvelle connexion et préférences avec les pages standard !';
$lang['Two factor authentication is here'] = 'L\'authentification à deux facteurs est disponible ici';
$lang['UI redesigns that make a difference'] = 'Des refontes d\'interface utilisateur qui font la différence';

View File

@@ -415,6 +415,9 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
include($upgrade_file); include($upgrade_file);
conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION)); conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
//Conf delete param on last major update for whats new popin to be displayed when changing major version
conf_delete_param('last_major_update');
// Something to add in database.inc.php? // Something to add in database.inc.php?
if (!empty($mysql_changes)) if (!empty($mysql_changes))
{ {