Author: pierre.andrews@gmail.com
Date: Sun Jul 30 20:24:48 2006
New Revision: 4295
Log:
recherche dans ses photos avant de choisir
Modified:
_plugins_/_contenu_editorial_/FpipR/exec/flickr_choix_photos.php
_plugins_/_contenu_editorial_/FpipR/lang/fpipr_en.php
_plugins_/_contenu_editorial_/FpipR/lang/fpipr_fr.php
Modified: _plugins_/_contenu_editorial_/FpipR/exec/flickr_choix_photos.php
--- _plugins_/_contenu_editorial_/FpipR/exec/flickr_choix_photos.php (original)
+++ _plugins_/_contenu_editorial_/FpipR/exec/flickr_choix_photos.php Sun Jul 30 20:24:48 2006
@@ -13,6 +13,7 @@
<style>
li {float: left; list-style-type:none; height: 90px; width: 90px; margin: 1em;}
li img {display:block; clear:both;}
+ #recherche label {display: block;}
</style>
</head>
@@ -29,7 +30,9 @@
if($row['flickr_nsid'] != '' && $row['flickr_token'] != '') {
$page = _request('page')?_request('page'):1;
//TODO: ajouter des options de recherches
- $photos = flickr_photos_search(40,$page,$row['flickr_nsid'],'','','','','','','','','','','',$row['flickr_token']);
+ $sort = _request('sort')?_request('sort'):'date-posted-desc';
+
+ $photos = flickr_photos_search(40,$page,$row['flickr_nsid'],'','',_request('text_search'),'','','','','',$sort,'','',$row['flickr_token']);
$html = '<input type="hidden" name="flickr_nsid" value="'.$row['flickr_nsid'].'">';
@@ -67,19 +70,40 @@
} else {
echo generer_action_auteur('flickr_ajouter_documents',_request('id'), generer_url_ecrire('breves_edit','id_breve='._request('id')),$html);
}
+ if($photos->pages > 1) {
echo '<hr/><h3>'._T('fpipr:pages').':</h3>';
-
-
for($i=1;$i <= $photos->pages;$i++) {
if($i != $page) {
- echo '<a href="'.generer_url_ecrire('flickr_choix_photos',"page=$i&type="._request('type')."&id="._request('id')).'">';
+ echo '<a href="'.generer_url_ecrire('flickr_choix_photos',"page=$i&type="._request('type')."&id="._request('id')."&sort=$sort".(_request('text_search')?"&text_search="._request('text_search'):'')).'">';
}
echo $i.'|';
if($i != $page) {
echo '</a>';
}
-
+ echo "\n";
}
+ }
+
+ echo '<hr/><h3>'._T('fpipr:recherche').':</h3>';
+ echo '<form id="recherche" method="get">';
+ echo '<input type="hidden" name="exec" value="'._request('exec').'"/>';
+ echo '<input type="hidden" name="type" value="'._request('type').'"/>';
+ echo '<input type="hidden" name="id" value="'._request('id').'"/>';
+ echo '<label for="text_search">'._T('fpipr:text_search').':</label>';
+ echo '<input type="text" name="text_search" id="text_search" value="'._request('text_search').'"/>';
+ echo '<label for="sort">'._T('fpipr:ordre').'</label>';
+ echo '<select name="sort" id="sort">';
+ echo '<option value="date-posted-asc"'.(($sort=="date-posted-asc")?' selected="true"':'').'>'._T('fpipr:date-posted-asc').'</option>';
+ echo '<option value="date-posted-desc"'.(($sort=="date-posted-desc")?' selected="true"':'').'>'._T('fpipr:date-posted-desc').'</option>';
+ echo '<option value="date-taken-asc"'.(($sort=="date-taken-asc")?' selected="true"':'').'>'._T('fpipr:date-posted-asc').'</option>';
+ echo '<option value="date-taken-desc"'.(($sort=="date-taken-desc")?' selected="true"':'').'>'._T('fpipr:date-taken-desc').'</option>';
+ echo '<option value="interestingness-desc"'.(($sort=="interestingness-desc")?' selected="true"':'').'>'._T('fpipr:interestingness-desc').'</option>';
+ echo '<option value="interestingness-asc"'.(($sort=="interestingness-asc")?' selected="true"':'').'>'._T('fpipr:interestingness-asc').'</option>';
+ echo '<option value="relevance"'.(($sort=="relevance")?' selected="true"':'').'>'._T('fpipr:relevance').'</option>';
+ echo '</select>';
+ echo '<button type="submit">'._T('fpipr:recherche').'</button>';
+ echo '</form>';
+
} else {
echo _T('fpipr:demande_authentification',array('url'=>generer_url_ecrire('auteurs_edit','id_auteur='.$connect_id_auteur)));
}
Modified: _plugins_/_contenu_editorial_/FpipR/lang/fpipr_en.php
--- _plugins_/_contenu_editorial_/FpipR/lang/fpipr_en.php (original)
+++ _plugins_/_contenu_editorial_/FpipR/lang/fpipr_en.php Sun Jul 30 20:24:48 2006
@@ -15,7 +15,17 @@
'info_sets' => 'Please choose the sets of photos to add.',
'demande_authentification' => 'You must first authorize Flickr <a href="@url@">here</a>',
'pages' => 'Pages',
- 'retour' => 'Back'
+ 'retour' => 'Back',
+ 'recherche' => 'Search',
+ 'ordre' => 'Order by',
+ 'text_search' => 'Full Text Search',
+ 'date-posted-asc' => 'Date posted, ascendant',
+ 'date-posted-desc' => 'Date posted, descendant',
+ 'date-taken-asc' => 'Date taken, ascendant',
+ 'date-taken-desc' => 'Date taken, descendant',
+ 'interestingness-asc' => 'Interestingness, ascendant',
+ 'interestingness-desc' => 'Interestingness, descendant',
+ 'relevance' => 'Relevance'
);
?>
Modified: _plugins_/_contenu_editorial_/FpipR/lang/fpipr_fr.php
--- _plugins_/_contenu_editorial_/FpipR/lang/fpipr_fr.php (original)
+++ _plugins_/_contenu_editorial_/FpipR/lang/fpipr_fr.php Sun Jul 30 20:24:48 2006
@@ -15,7 +15,17 @@
'info_sets' => 'Veillez choisir les sets que vous voulez ajouter.',
'demande_authentification' => 'vous devez d\'abord vous authentifier <a href="@url@">là</a>',
'pages' => 'Pages',
- 'retour' => 'Retour'
+ 'retour' => 'Retour',
+ 'recherche' => 'Recherche',
+ 'ordre' => 'Ordonner par',
+ 'text_search' => 'dans tout le texte (titre, description, tag)',
+ 'date-posted-asc' => 'Dates d\'envoie, ascendantes',
+ 'date-posted-desc' => 'Dates d\'envoie, descendantes',
+ 'date-taken-asc' => 'Dates de prise de vue, ascendantes',
+ 'date-taken-desc' => 'Dates de prise de vue, descendantes',
+ 'interestingness-asc' => 'Interestingness, ascendant',
+ 'interestingness-desc' => 'Interestingness, descendant',
+ 'relevance' => 'Pertinence'
);
?>