archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- bug 180 fixed: (report from BSF) remote_site.tpl doesn't validate.

Browse source 
- 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
This commit is contained in:
plegall 2005-11-08 21:26:30 +00:00
parent f5d15d6b12
commit d17eac9104
5 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
admin/remote_site.php
View file

@ -714,6 +714,12 @@ SELECT id, galleries_url
WHERE id != 1 WHERE id != 1
;'; ;';
$result = pwg_query($query); $result = pwg_query($query);
if (mysql_num_rows($result) > 0)
{
$template->assign_block_vars('sites', array());
}
while ($row = mysql_fetch_array($result)) while ($row = mysql_fetch_array($result))
{ {
$base_url = PHPWG_ROOT_PATH.'admin.php'; $base_url = PHPWG_ROOT_PATH.'admin.php';
@ -722,7 +728,7 @@ while ($row = mysql_fetch_array($result))
$base_url.= '&action='; $base_url.= '&action=';
$template->assign_block_vars( $template->assign_block_vars(
'site', 'sites.site',
array( array(
'NAME' => $row['galleries_url'], 'NAME' => $row['galleries_url'],
'U_GENERATE' => add_session_id($base_url.'generate'), 'U_GENERATE' => add_session_id($base_url.'generate'),

9
doc/ChangeLog
View file

@ -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 2005-11-08 Pierrick LE GALL
* Branch 1.5 creation * Branch 1.5 creation

2
language/en_UK.iso-8859-1/admin.lang.php
View file

@ -239,7 +239,7 @@ $lang['remote_site'] = 'Remote site';
$lang['remote_site_already_exists'] = 'This site already exists'; $lang['remote_site_already_exists'] = 'This site already exists';
$lang['remote_site_clean'] = 'clean'; $lang['remote_site_clean'] = 'clean';
$lang['remote_site_clean_hint'] = 'remove remote listing.xml file'; $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_created'] = 'created';
$lang['remote_site_delete'] = 'delete'; $lang['remote_site_delete'] = 'delete';
$lang['remote_site_delete_hint'] = 'delete this site and all its attached elements'; $lang['remote_site_delete_hint'] = 'delete this site and all its attached elements';

2
language/fr_FR.iso-8859-1/admin.lang.php
View file

@ -237,7 +237,7 @@ $lang['remote_site'] = 'Site distant';
$lang['remote_site_already_exists'] = 'Ce site existe déjà'; $lang['remote_site_already_exists'] = 'Ce site existe déjà';
$lang['remote_site_clean'] = 'nettoyer'; $lang['remote_site_clean'] = 'nettoyer';
$lang['remote_site_clean_hint'] = 'supprimer le fichier listing.xml distant'; $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_created'] = 'créé';
$lang['remote_site_delete'] = 'supprimé'; $lang['remote_site_delete'] = 'supprimé';
$lang['remote_site_delete_hint'] = 'supprimer ce site distant et toutes les informations associées'; $lang['remote_site_delete_hint'] = 'supprimer ce site distant et toutes les informations associées';

12
template/yoga/admin/remote_site.tpl
View file

@ -68,14 +68,16 @@
</p> </p>
</form> </form>
<!-- BEGIN sites -->
<table> <table>
<!-- BEGIN site --> <!-- BEGIN site -->
<tr> <tr>
<td>{site.NAME}</td> <td>{sites.site.NAME}</td>
<td>[<a href="{site.U_GENERATE}" title="{L_REMOTE_SITE_GENERATE_HINT}">{L_REMOTE_SITE_GENERATE}</a>]</td> <td>[<a href="{sites.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="{sites.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="{sites.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>[<a href="{sites.site.U_DELETE}" title="{L_REMOTE_SITE_DELETE_HINT}">{L_REMOTE_SITE_DELETE}</a>]</td>
</tr> </tr>
<!-- END site --> <!-- END site -->
</table> </table>
<!-- END sites -->