adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing keys and misspelling keys in translations +

Browse Source 
small refatcoring in admin/history.

git-svn-id: http://piwigo.org/svn/trunk@5576 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2010-04-02 18:32:23 +00:00
parent 4061fefe71
commit 213cacc855
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/history.php
+19 -12
View File
@@ -51,7 +51,11 @@ else
}
$types = array('none', 'picture', 'high', 'other');
$display_thumbnails = array('No display', 'Classic display', 'Hoverbox display');
$display_thumbnails = array('no_display_thumbnail' => l10n('No display'),
'display_thumbnail_classic' => l10n('Classic display'),
'display_thumbnail_hoverbox' => l10n('Hoverbox display')
);
// +-----------------------------------------------------------------------+
// | Check Access and exit when user status is not ok |
@@ -116,14 +120,21 @@ if (isset($_POST['submit']))
$search['fields']['display_thumbnail'] = $_POST['display_thumbnail'];
// Display choise are also save to one cookie
$cookie_val = ($_POST['display_thumbnail']!=$display_thumbnails[2] and in_array($_POST['display_thumbnail'], $display_thumbnails)) ? $_POST['display_thumbnail']:null;
pwg_set_cookie_var('history_display_thumbnail', $cookie_val, strtotime('+1 month') );
if (!empty($_POST['display_thumbnail'])
and isset($display_thumbnails[$_POST['display_thumbnail']]))
{
$cookie_val = $_POST['display_thumbnail'];
}
else
{
$cookie_val = null;
}
pwg_set_cookie_var('display_thumbnail', $cookie_val, strtotime('+1 month') );
// TODO manage inconsistency of having $_POST['image_id'] and
// $_POST['filename'] simultaneously
// echo '<pre>'; print_r($search); echo '</pre>';
if (!empty($search))
{
// register search rules in database, then they will be available on
@@ -624,7 +635,7 @@ else
$form['types'] = $types;
// Hoverbox by default
$form['display_thumbnail'] =
pwg_get_cookie_var('history_display_thumbnail', $display_thumbnails[2]);
pwg_get_cookie_var('display_thumbnail', 'no_display_thumbnail');
}
@@ -671,12 +682,8 @@ $template->assign(
)
);
$template->assign(
array(
'display_thumbnail_values' => $display_thumbnails,
'display_thumbnail_selected' => array($form['display_thumbnail']),
)
);
$template->assign('display_thumbnails', $display_thumbnails);
$template->assign('display_thumbnail_selected', $form['display_thumbnail']);
// +-----------------------------------------------------------------------+
// | html code display |