From 48062b326401fe751e86592f397938bb407e53d5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sun, 19 Aug 2007 18:16:15 +0000
Subject: [PATCH] un peu de menage dans iconifier et report des styles en dur
 dans la css deplier la boite icone par defaut maintenant qu'elle a de la
 place

---
 dist/style_prive.html       |  4 ++++
 ecrire/exec/articles.php    | 18 +++++++++---------
 ecrire/exec/breves_voir.php |  2 +-
 ecrire/exec/naviguer.php    |  2 +-
 ecrire/exec/sites.php       |  2 +-
 ecrire/inc/iconifier.php    |  4 +---
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dist/style_prive.html b/dist/style_prive.html
index a53819e685..7faf7447b6 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -1682,6 +1682,10 @@ div.titrem {
 #liste_images .legender .titrem, #liste_documents .legender .titrem { background-color: #fff; }
 #navigation .hover, #extra .hover, .joindre .hover, #liste_images .hover, #liste_documents .hover {background-color:#GET{claire};}
 
+.iconifier div div.titrem {text-align:#GET{left};}
+.iconifier div div {text-align:center;}
+.iconifier div div label {text-align:#GET{left};display:block;}
+
 /* Deplier / Replier */
 .replie, .deplie.hoverwait { background-image: url(#EVAL{_DIR_IMG_PACK}wrapper.php?file=deplierhaut[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif); }
 .hover { background-color: #GET{claire}; }
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 67367b7ff8..0b4d544d44 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -110,7 +110,7 @@ function articles_affiche($id_article, $row, $cherche_auteur, $ids, $cherche_mot
 
 	if ($flag_editable AND ($spip_display != 4)) {
 		$iconifier = charger_fonction('iconifier', 'inc');
-		$icone = $iconifier('id_article', $id_article,'articles');
+		$icone = $iconifier('id_article', $id_article,'articles', true);
 	} else $icone = '';
 
 	$instituer_article = charger_fonction('instituer_article', 'inc');
@@ -147,13 +147,6 @@ function articles_affiche($id_article, $row, $cherche_auteur, $ids, $cherche_mot
 		AND autoriser('voirrevisions', 'article', $id_article))
 			$actions .= icone_inline(_T('info_historique_lien'), generer_url_ecrire("articles_versions","id_article=$id_article"), "historique-24.gif", "rien.gif", $spip_lang_left);
 
-	// statistiques
-	if ($row['statut'] == 'publie'
-		AND $row['visites'] > 0
-		AND $GLOBALS['meta']["activer_statistiques"] != "non"
-		AND autoriser('voirstats', $type, $id))
-			$actions .= icone_inline(_T('icone_evolution_visites', array('visites' => $row['visites'])), generer_url_ecrire("statistiques_visites","id_article=$id"), "statistiques-24.gif","rien.gif", $spip_lang_left);
-
 	$actions .= "<div class='nettoyeur'></div>";
 	
 	$haut =
@@ -179,7 +172,14 @@ function articles_affiche($id_article, $row, $cherche_auteur, $ids, $cherche_mot
 	  );
 	
 	$onglet_interactivite = array(_L('Interactivit&eacute;'),
-	  boites_de_config_articles($id_article)
+		// statistiques
+		(($row['statut'] == 'publie'
+		AND $row['visites'] > 0
+		AND $GLOBALS['meta']["activer_statistiques"] != "non"
+		AND autoriser('voirstats', $type, $id)) ?
+		  icone_horizontale(_T('icone_evolution_visites', array('visites' => $row['visites'])), generer_url_ecrire("statistiques_visites","id_article=$id"), "statistiques-24.gif","rien.gif", false)
+		  : "")
+	  . boites_de_config_articles($id_article)
 		);
 		
 	$onglet_discuter = array(_L('Discuter'),
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 418abc8d72..2cc5218dd4 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -176,7 +176,7 @@ function afficher_breves_voir($id_breve, $cherche_mot, $select_groupe)
 		  );
 
 	$onglet_documents = array(_L('Documents'),
-		($iconifier ? $iconifier('id_breve', $id_breve, 'breves_voir') : "")
+		($iconifier ? $iconifier('id_breve', $id_breve, 'breves_voir', true) : "")
 	  );
 	
 	$onglet_interactivite = array(_L('Interactivit&eacute;'),
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index bcfdb336bd..c184fcc278 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -179,7 +179,7 @@ function exec_naviguer_dist()
 	// Logos de la rubrique
 	$iconifier = charger_fonction('iconifier', 'inc');
 	$onglet_documents = array(_L('Documents'),
-	  $iconifier('id_rubrique', $id_rubrique, 'naviguer')
+	  $iconifier('id_rubrique', $id_rubrique, 'naviguer', true)
 		/// Documents associes a la rubrique
 		. ($id_rubrique > 0 ? naviguer_doc($id_rubrique, "rubrique", 'naviguer', $flag_editable) :"" )
 	);
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index 154ffc9bff..5432e3e509 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -184,7 +184,7 @@ function afficher_site($id_syndic, $id_rubrique, $nom_site, $row){
 	  );
 
 	$onglet_documents = array(_L('Documents'),
-	  $iconifier ? $iconifier('id_syndic', $id_syndic, 'sites') :""
+	  $iconifier ? $iconifier('id_syndic', $id_syndic, 'sites', true) :""
 	  //. articles_documents('article', $id_article)
 	  );
 	
diff --git a/ecrire/inc/iconifier.php b/ecrire/inc/iconifier.php
index adbe27ee2e..2e4b0f25b6 100644
--- a/ecrire/inc/iconifier.php
+++ b/ecrire/inc/iconifier.php
@@ -55,14 +55,12 @@ function inc_iconifier_dist($id_objet, $id,  $script, $visible=false) {
 			$masque = debut_block_depliable($visible,'on') . $clic . fin_block() . $survol;
 	}
 
-		$res = "$img<div style='text-align: center'>$masque</div>";;
+		$res = "$img$masque";
 	}
 
 	if ($res) {
 		$res = debut_cadre('r', 'image-24.gif', '', $bouton, '', '', false)
-			. "<div class='verdana1' style='text-align: center;'>"
 			. $res
-			. "</div>"
 			. fin_cadre_relief(true);
 
 		$js = "";
-- 
GitLab