CVS: spip/ecrire articles_tous.php3, 1.15, 1.16 brouteur_frame.php3, 1.2, 1.3 inc_layer.php3, 1.21, 1.22 inc_presentation.php3, 1.348, 1.349 layer.js, 1.3, 1.4 spip_style.php3, 1.43, 1.44

[Genuine_VIAGRA_Onlin (Genuine VIAGRA © Online Store)]

Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv27572/ecrire

Modified Files:
  articles_tous.php3 brouteur_frame.php3 inc_layer.php3
  inc_presentation.php3 layer.js spip_style.php3
Log Message:
Petites modifs graphiques.
Boutons "Tout dŽplier", "Tout replier" dans la page "Tout le site"

Index: articles_tous.php3

RCS file: /home/spip-cvs/spip/ecrire/articles_tous.php3,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- articles_tous.php3 27 Nov 2003 15:43:07 -0000 1.15
+++ articles_tous.php3 28 Nov 2003 12:46:35 -0000 1.16
@@ -111,7 +111,7 @@
         if ($article[$id_rubrique]) {
           while(list(,$zarticle) = each($article[$id_rubrique]) ) {
             
- echo "<div>$zarticle</div>\n";
+ echo "$zarticle\n";
           }
                 
         }
@@ -136,6 +136,16 @@
     
     $les_rubriques[] = "rubrique$id_rubrique";
     
+ $nom_block = "rubrique$id_rubrique";
+ if (!$numero_block["$nom_block"] > 0){
+ $compteur_block++;
+ $numero_block["$nom_block"] = $compteur_block;
+ }
+
+
+ $javasc_ouvrir .= "ouvrir_couche('$compteur_block', '$spip_lang_rtl');";
+ $javasc_fermer .= "fermer_couche('$compteur_block', '$spip_lang_rtl');";
+
     if ($id_parent == '0') {
       $rubrique[$id_rubrique] = "$titre";
     }
@@ -179,16 +189,22 @@

   // Demarrer l'affichage
- /*
   if ($les_rubriques AND test_layer()) {
     $les_rubriques = join($les_rubriques,",");
+ echo "<div>&nbsp;</div>";
     echo "<b class='verdana2'>";
- echo bouton_block_invisible("$les_rubriques");
- echo " "._T('lien_tout_deplier');
- echo "</div>";
+ echo "<a href=\"javascript:$javasc_ouvrir\">";
+ echo _T('lien_tout_deplier');
+ echo "</a>";
+ echo "</b>";
+ echo " | ";
+ echo "<b class='verdana2'>";
+ echo "<a href=\"javascript:$javasc_fermer\">";
+ echo _T('lien_tout_replier');
+ echo "</a>";
+ echo "</b>";
     echo "<div>&nbsp;</div>";
   }
- */
   
   afficher_rubriques_filles(0);

Index: brouteur_frame.php3

RCS file: /home/spip-cvs/spip/ecrire/brouteur_frame.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- brouteur_frame.php3 26 Nov 2003 00:01:45 -0000 1.2
+++ brouteur_frame.php3 28 Nov 2003 12:46:35 -0000 1.3
@@ -57,8 +57,8 @@

   if ($id_rubrique > 0) {
- //if ($connect_statut == "0minirezo") $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE id_rubrique=$id_rubrique ORDER BY date DESC";
- $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_rubrique=$id_rubrique AND (articles.statut = 'publie' OR articles.statut = 'prop' OR (articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur)) GROUP BY id_article ORDER BY articles.date DESC";
+ if ($connect_statut == "0minirezo") $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE id_rubrique=$id_rubrique ORDER BY date DESC";
+ else $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_rubrique=$id_rubrique AND (articles.statut = 'publie' OR articles.statut = 'prop' OR (articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur)) GROUP BY id_article ORDER BY articles.date DESC";
     $result=spip_query($query);
     if (spip_num_rows($result)>0) {
       echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T('info_articles')."</b></div>";
@@ -83,8 +83,8 @@
             $puce = 'poubelle';
             break;
         }
- $puce = "puce-$puce.gif";
- echo "<div style='margin-$spip_lang_left:3px; margin-$spip_lang_right: 3px; padding-$spip_lang_left: 17px; background: url(img_pack/$puce) $spip_lang_left center no-repeat;'><div style='padding: 3px; background-color: #e0e0e0; border-top: 1px solid white; border-left: 1px solid white; border-right: 1px solid #aaaaaa; border-bottom: 1px solid #aaaaaa;'><a href='javascript:window.parent.location=\"articles.php3?id_article=$id_article\"'>$titre</a></div></div>";
+ $puce = "puce-$puce-breve.gif";
+ echo "<div class='puce-article' style='background: url(img_pack/$puce) $spip_lang_left center no-repeat;'><div><a href='javascript:window.parent.location=\"articles.php3?id_article=$id_article\"' class='verdana1'>$titre</a></div></div>";
       }
     }

Index: inc_layer.php3

RCS file: /home/spip-cvs/spip/ecrire/inc_layer.php3,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- inc_layer.php3 4 Nov 2003 01:35:24 -0000 1.21
+++ inc_layer.php3 28 Nov 2003 12:46:35 -0000 1.22
@@ -94,7 +94,7 @@
       $javasc .= "swap_couche(\\'".$numero_block[$nom_block]."\\', \\'$spip_lang_rtl\\');";
     }
     $retour = "\n<script type='text/javascript'><!--\n";
- $retour .= "document.write('<a href=\"javascript:$javasc\"><img name=\"triangle$num_triangle\" src=\"img_pack/deplierhaut$spip_lang_rtl.gif\" alt=\"\" title=\"".addslashes(_T('info_deplier'))."\" width=\"16\" height=\"14\" border=\"0\"></a> ');\n";
+ $retour .= "document.write('<a href=\"javascript:$javasc\"><img name=\"triangle".$numero_block["$nom_block"]."\" src=\"img_pack/deplierhaut$spip_lang_rtl.gif\" alt=\"\" title=\"".addslashes(_T('info_deplier'))."\" width=\"16\" height=\"14\" border=\"0\"></a> ');\n";
     $retour .= "//-->\n";
     $retour .= "</script>\n";

@@ -102,6 +102,7 @@
     return $retour;
   }
}
+

function bouton_block_visible($nom_block){
   global $spip_lang_rtl;

Index: inc_presentation.php3

RCS file: /home/spip-cvs/spip/ecrire/inc_presentation.php3,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- inc_presentation.php3 27 Nov 2003 13:02:21 -0000 1.348
+++ inc_presentation.php3 28 Nov 2003 12:46:35 -0000 1.349
@@ -1534,11 +1534,12 @@

   if ($options == 'avancees') {
     global $id_rubrique;
- if ($id_rubrique > 0) echo "<a href='brouteur.php3?id_rubrique=$id_rubrique' title='"._T('icone_site_entier')."'><img src='img_pack/naviguer-site.gif' alt='nav' width='26' height='20' border='0'></a>";
- else echo "<a href='brouteur.php3' title='"._T('icone_site_entier')."'><img src='img_pack/naviguer-site.gif' alt='nav' width='26' height='20' border='0'></a>";
+ if ($id_rubrique > 0) echo "<a href='brouteur.php3?id_rubrique=$id_rubrique' title='"._T('icone_site_entier')."'><img src='img_pack/naviguer-site.gif' alt='nav' width='26' height='20' border='0'></a> ";
+ else echo "<a href='brouteur.php3' title='"._T('icone_site_entier')."'><img src='img_pack/naviguer-site.gif' alt='nav' width='26' height='20' border='0'></a> ";
+ if ($activer_messagerie == "oui" AND $connect_activer_messagerie != "non") echo "<a href='calendrier.php3' title='"._T('icone_agenda')."'><img src='img_pack/cal-mois.gif' alt='jour' width='26' height='20' border='0'></a>";
     
     if ($activer_messagerie != 'non' AND $connect_activer_messagerie != 'non') {
- echo " &nbsp; <font face='arial,helvetica,sans-serif' size=1><b>";
+ echo "</td><td> <font face='arial,helvetica,sans-serif' size=1><b>";
       $result_messages = spip_query("SELECT * FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE lien.id_auteur=$connect_id_auteur AND vu='non' AND statut='publie' AND type='normal' AND lien.id_message=messages.id_message");
       $total_messages = @spip_num_rows($result_messages);
       if ($total_messages == 1) {
@@ -1548,10 +1549,9 @@
         }
       }
       if ($total_messages > 1) echo "<a href='messagerie.php3'><font color='$couleur_claire'>"._T('info_nouveaux_messages', array('total_messages' => $total_messages))."</font></a>";
- echo "</b></font> &nbsp; ";
+ echo "</b></font>";
     }

- if ($activer_messagerie == "oui" AND $connect_activer_messagerie != "non") echo "<a href='calendrier.php3' title='"._T('icone_agenda')."'><img src='img_pack/cal-mois.gif' alt='jour' width='26' height='20' border='0'></a>";
   }

   echo "</td>";

Index: layer.js

RCS file: /home/spip-cvs/spip/ecrire/layer.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- layer.js 12 Mar 2003 19:57:48 -0000 1.3
+++ layer.js 28 Nov 2003 12:46:35 -0000 1.4
@@ -21,3 +21,18 @@
     vis[couche] = 'hide';
   }
}
+function ouvrir_couche(couche, rtl) {
+ triangle = MM_findObj('triangle' + couche);
+ if (!(layer = MM_findObj('Layer' + couche))) return;
+ if (triangle) triangle.src = 'img_pack/deplierbas' + rtl + '.gif';
+ layer.style.display = 'block';
+ vis[couche] = 'show';
+}
+function fermer_couche(couche, rtl) {
+ triangle = MM_findObj('triangle' + couche);
+ if (!(layer = MM_findObj('Layer' + couche))) return;
+ if (triangle) triangle.src = 'img_pack/deplierhaut' + rtl + '.gif';
+ layer.style.display = 'none';
+ vis[couche] = 'hide';
+}
+

Index: spip_style.php3

RCS file: /home/spip-cvs/spip/ecrire/spip_style.php3,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- spip_style.php3 27 Nov 2003 15:43:07 -0000 1.43
+++ spip_style.php3 28 Nov 2003 12:46:35 -0000 1.44
@@ -594,6 +594,14 @@
   border-right: 1px solid #aaaaaa;
   border-bottom: 1px solid #aaaaaa;
}
+div.puce-article div:hover {
+ padding: 2px;
+ background-color: white;
+ border-bottom: 1px solid white;
+ border-right: 1px solid white;
+ border-left: 1px solid #aaaaaa;
+ border-top: 1px solid #aaaaaa;
+}

/*
  * Styles generes par les raccourcis de mis en page