From d17eac910475693f64da8d772c92d1802ca34e1c Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 8 Nov 2005 21:26:30 +0000
Subject: - 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 !


git-svn-id: http://piwigo.org/svn/branches/branch-1_5@929 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/remote_site.php                    |  8 +++++++-
 doc/ChangeLog                            |  9 +++++++++
 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 +++++++-----
 5 files changed, 25 insertions(+), 8 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.= '&amp;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 445e39938..93297e827 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+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
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 @@
   </p>
 </form>
 
+<!-- BEGIN sites -->
 <table>
   <!-- BEGIN site -->
   <tr>
-    <td>{site.NAME}</td>
-    <td>[<a href="{site.U_GENERATE}" title="{L_REMOTE_SITE_GENERATE_HINT}">{L_REMOTE_SITE_GENERATE}</a>]</td>
-    <td>[<a href="{site.U_UPDATE}" title="{L_REMOTE_SITE_UPDATE_HINT}">{L_REMOTE_SITE_UPDATE}</a>]</td>
-    <td>[<a href="{site.U_CLEAN}" title="{L_REMOTE_SITE_CLEAN_HINT}">{L_REMOTE_SITE_CLEAN}</a>]</td>
-    <td>[<a href="{site.U_DELETE}" title="{L_REMOTE_SITE_DELETE_HINT}">{L_REMOTE_SITE_DELETE}</a>]</td>
+    <td>{sites.site.NAME}</td>
+    <td>[<a href="{sites.site.U_GENERATE}" title="{L_REMOTE_SITE_GENERATE_HINT}">{L_REMOTE_SITE_GENERATE}</a>]</td>
+    <td>[<a href="{sites.site.U_UPDATE}" title="{L_REMOTE_SITE_UPDATE_HINT}">{L_REMOTE_SITE_UPDATE}</a>]</td>
+    <td>[<a href="{sites.site.U_CLEAN}" title="{L_REMOTE_SITE_CLEAN_HINT}">{L_REMOTE_SITE_CLEAN}</a>]</td>
+    <td>[<a href="{sites.site.U_DELETE}" title="{L_REMOTE_SITE_DELETE_HINT}">{L_REMOTE_SITE_DELETE}</a>]</td>
   </tr>
   <!-- END site -->
 </table>
+<!-- END sites -->
\ No newline at end of file
-- 
cgit v1.2.3