X-Git-Url: http://git.cyclocoop.org/?p=velocampus%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Finc%2Fformater_article.php;fp=www%2Fecrire%2Finc%2Fformater_article.php;h=40e98cc3963efeaf9a82e7e7652410b657df02bc;hp=e49259901fe6783ac4f2bfc297ebf1a2eb72b631;hb=e99f0878011913365e49b30d90e496c24c301393;hpb=80b4d3e85f78d402ed2e73f8f5d1bf4c19962eed

diff --git a/www/ecrire/inc/formater_article.php b/www/ecrire/inc/formater_article.php
index e492599..40e98cc 100644
--- a/www/ecrire/inc/formater_article.php
+++ b/www/ecrire/inc/formater_article.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2011                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -46,33 +46,46 @@ function inc_formater_article_dist($row, $own='')
 		if ($logo = $chercher_logo($id_article, 'id_article', 'on')) {
 			list($fid, $dir, $nom, $format) = $logo;
 			include_spip('inc/filtres_images_mini');
-			$logo = image_reduire("<img src='$fid' alt='' />", 26, 20);
-		}
+			$logo = "<span style='float: $spip_lang_right; margin-top: -2px; margin-bottom: -2px;'>" .
+			  image_reduire("<img src='$fid' alt='' />", 26, 20) .
+			  "</span>";
+		} else $logo = '';
 	} else $logo ='';
 
-	$titre = sinon($row['titre'], _T('ecrire:info_sans_titre'));
+	$titre = supprime_img($row['titre'],'');
 	$id_rubrique = $row['id_rubrique'];
 	$date = $row['date'];
 	$statut = $row['statut'];
 	$descriptif = $row['descriptif'];
-	$lang_dir = lang_dir(($lang = $row['lang']) ? changer_typo($lang):'');
-
-	$lien  = "<div>"
+	$lang = $row['lang'];
+	$dir = "dir='" . lang_dir($lang ? changer_typo($lang) : '') . "'";
+	if ($lang AND $afficher_langue AND $lang != $GLOBALS['meta']['langue_site'])
+		$lang = " <span class='spip_xx-small' style='color: #666666' "
+		  . $dir
+		  . '>('
+		  . traduire_nom_langue($lang)
+		  . ')</span>';
+	else $lang = '';
+
+	$arg = "id_article=$id_article";
+	$url_a = generer_url_ecrire("articles", $arg);
+	if (!$row['petition'])
+		$petition = '';
+	else
+		$petition = " <a href='" . generer_url_ecrire('controle_petition', $arg) . "' class='spip_xx-small' style='color: red'>"._T('lien_petitions') . "</a>";
+
+	$lien = "<div>"
+	. $logo
+	. (acces_restreint_rubrique($id_rubrique) ? $img_admin : '')
 	. "<a href='"
-	. generer_url_ecrire("articles","id_article=$id_article")
+	. $url_a
 	. "'"
-	. (!$descriptif ? '' : 
-	     (' title="'.attribut_html(typo($descriptif)).'"'))
-	. " dir='$lang_dir'>"
-	. (!$logo ? '' :
-	   ("<span style='float: $spip_lang_right; margin-top: -2px; margin-bottom: -2px;'>" . $logo . "</span>"))
-	. (acces_restreint_rubrique($id_rubrique) ? $img_admin : '')
-	  . typo(supprime_img($titre,''))
-	. (!($afficher_langue AND $lang != $GLOBALS['meta']['langue_site'] AND strlen($lang)) ? '' :
-	   (" <span class='spip_xx-small' style='color: #666666' dir='$lang_dir'>(".traduire_nom_langue($lang).")</span>"))
-	  . (!$row['petition'] ? '' :
-	     ("</a> <a href='" . generer_url_ecrire('controle_petition', "id_article=$id_article") . "' class='spip_xx-small' style='color: red'>"._T('lien_petitions')))
+	. (!$descriptif ? '': (' title="'.attribut_html(typo($descriptif)).'"'))
+	. " $dir>"
+	. typo(strlen($titre) ? $titre : _T('ecrire:info_sans_titre'))
 	. "</a>"
+	. $lang
+	. $petition
 	. "</div>";
 	
 	if ($spip_display == 4) return array($lien);