From 648b69b56c7c202645a5fd6baadb81a72bfcc6a0 Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 8 Nov 2005 21:26:30 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'release-1_5_0'. git-svn-id: http://piwigo.org/svn/tags/release-1_5_0@930 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/remote_site.php | 8 +++++++- doc/ChangeLog | 16 ++++++++++++++++ include/config_default.inc.php | 4 ++-- language/en_UK.iso-8859-1/admin.lang.php | 2 +- language/fr_FR.iso-8859-1/admin.lang.php | 2 +- template/yoga/admin/remote_site.tpl | 12 +++++++----- 6 files changed, 34 insertions(+), 10 deletions(-) diff --git a/admin/remote_site.php b/admin/remote_site.php index 5044bd45a..fb778084f 100644 --- a/admin/remote_site.php +++ b/admin/remote_site.php @@ -714,6 +714,12 @@ SELECT id, galleries_url WHERE id != 1 ;'; $result = pwg_query($query); + +if (mysql_num_rows($result) > 0) +{ + $template->assign_block_vars('sites', array()); +} + while ($row = mysql_fetch_array($result)) { $base_url = PHPWG_ROOT_PATH.'admin.php'; @@ -722,7 +728,7 @@ while ($row = mysql_fetch_array($result)) $base_url.= '&action='; $template->assign_block_vars( - 'site', + 'sites.site', array( 'NAME' => $row['galleries_url'], 'U_GENERATE' => add_session_id($base_url.'generate'), diff --git a/doc/ChangeLog b/doc/ChangeLog index b590fb6b5..93297e827 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,19 @@ +2005-11-08 Pierrick LE GALL + + * bug 180 fixed: (report from BSF) remote_site.tpl doesn't + validate. + + * translation bug fixed: (report from BSF) + generate_file_listing.php doesn't exist, it's + create_listing_file.php ! + +2005-11-08 Pierrick LE GALL + + * Branch 1.5 creation + + * modification: on a fix branch, version is not shown, neither + generation time. + 2005-11-07 Pierrick LE GALL * bug 184 fixed: for the third time... diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 3b48dc72a..33b9eab0b 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -128,7 +128,7 @@ $conf['tn_height'] = 96; // show_version : shall the version of PhpWebGallery be displayed at the // bottom of each page ? -$conf['show_version'] = true; +$conf['show_version'] = false; // links : list of external links to add in the menu. An example is the best // than a long explanation : @@ -285,7 +285,7 @@ $conf['session_id_size'] = 10; $conf['show_queries'] = false; // show_gt : display generation time at the bottom of each page -$conf['show_gt'] = true; +$conf['show_gt'] = false; // debug_l10n : display a warning message each time an unset language key is // accessed diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index ea42b3f2a..abced94ae 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -239,7 +239,7 @@ $lang['remote_site'] = 'Remote site'; $lang['remote_site_already_exists'] = 'This site already exists'; $lang['remote_site_clean'] = 'clean'; $lang['remote_site_clean_hint'] = 'remove remote listing.xml file'; -$lang['remote_site_create'] = 'Create a new site : (give its URL to generate_file_listing.php)'; +$lang['remote_site_create'] = 'Create a new site : (give its URL to create_listing_file.php)'; $lang['remote_site_created'] = 'created'; $lang['remote_site_delete'] = 'delete'; $lang['remote_site_delete_hint'] = 'delete this site and all its attached elements'; diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 5f4b3c938..892f06ecf 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -237,7 +237,7 @@ $lang['remote_site'] = 'Site distant'; $lang['remote_site_already_exists'] = 'Ce site existe déjà'; $lang['remote_site_clean'] = 'nettoyer'; $lang['remote_site_clean_hint'] = 'supprimer le fichier listing.xml distant'; -$lang['remote_site_create'] = 'Créer un nouveau site distant : (donner son URL vers generate_file_listing.php)'; +$lang['remote_site_create'] = 'Créer un nouveau site distant : (donner son URL vers create_listing_file.php)'; $lang['remote_site_created'] = 'créé'; $lang['remote_site_delete'] = 'supprimé'; $lang['remote_site_delete_hint'] = 'supprimer ce site distant et toutes les informations associées'; diff --git a/template/yoga/admin/remote_site.tpl b/template/yoga/admin/remote_site.tpl index 13d2e2117..8f41384f6 100644 --- a/template/yoga/admin/remote_site.tpl +++ b/template/yoga/admin/remote_site.tpl @@ -68,14 +68,16 @@

+ - - - - - + + + + +
{site.NAME}[{L_REMOTE_SITE_GENERATE}][{L_REMOTE_SITE_UPDATE}][{L_REMOTE_SITE_CLEAN}][{L_REMOTE_SITE_DELETE}]{sites.site.NAME}[{L_REMOTE_SITE_GENERATE}][{L_REMOTE_SITE_UPDATE}][{L_REMOTE_SITE_CLEAN}][{L_REMOTE_SITE_DELETE}]
+ \ No newline at end of file -- cgit v1.2.3