Update of /home/spip-cvs/spip/ecrire
In directory alan:/tmp/cvs-serv11034/ecrire
Modified Files:
inc_presentation.php3 sites.php3
Log Message:
séparation de "calcul" et "recalcul" de la page : ainsi quand on fait "voir en ligne" depuis l'espace privé on ne recompile pas les squelettes ; le bouton "recalcul", lui, recompile comme avant.
Index: inc_presentation.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_presentation.php3,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -d -r1.565 -r1.566
--- inc_presentation.php3 13 May 2005 10:03:50 -0000 1.565
+++ inc_presentation.php3 27 May 2005 19:27:54 -0000 1.566
@@ -3103,14 +3103,14 @@
FROM spip_articles WHERE id_article=$id AND date<=NOW()")))
$statut = 'prop';
if ($statut == 'publie')
- $en_ligne = 'recalcul';
+ $en_ligne = 'calcul';
else if ($statut == 'prop')
$en_ligne = 'preview';
break;
case 'rubrique':
if ($id > 0)
if ($statut == 'publie')
- $en_ligne = 'recalcul';
+ $en_ligne = 'calcul';
else
$en_ligne = 'preview';
break;
@@ -3118,16 +3118,16 @@
case 'auteur':
case 'site':
if ($statut == 'publie')
- $en_ligne = 'recalcul';
+ $en_ligne = 'calcul';
else if ($statut == 'prop')
$en_ligne = 'preview';
break;
case 'mot':
- $en_ligne = 'recalcul';
+ $en_ligne = 'calcul';
break;
}
- if ($en_ligne == 'recalcul')
+ if ($en_ligne == 'calcul')
$message = _T('icone_voir_en_ligne');
else if ($en_ligne == 'preview') {
// est-ce autorise ?
@@ -3139,7 +3139,7 @@
}
if ($message)
- icone_horizontale($message, "../spip_redirect.php3?id_$type=$id&$en_ligne=oui", $image, "rien.gif");
+ icone_horizontale($message, "../spip_redirect.php3?id_$type=$id&var_mode=$en_ligne", $image, "rien.gif");
}
Index: sites.php3
RCS file: /home/spip-cvs/spip/ecrire/sites.php3,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sites.php3 16 May 2005 06:51:08 -0000 1.56
+++ sites.php3 27 May 2005 19:27:54 -0000 1.57
@@ -137,7 +137,7 @@
$result = spip_query($query);
if ($syndication_old != $syndication OR $url_syndic != $old_syndic) {
- $recalcul = "oui";
+ $reload = "oui";
}
if ($syndication_old != $syndication AND $syndication == "non") {
spip_query("DELETE FROM spip_syndic_articles WHERE id_syndic='$id_syndic'");
@@ -158,7 +158,7 @@
$link = new Link('sites.php3');
$link->addVar('id_syndic');
$link->addVar('redirect');
- $link->addVar('recalcul', $recalcul);
+ $link->addVar('reload', $reload);
$redirect = $link->getUrl();
$redirect_ok = 'oui';
}
@@ -180,9 +180,9 @@
//
-// recalcul
+// reload
//
-if ($recalcul == "oui") {
+if ($reload == "oui") {
$result = spip_query ("SELECT * FROM spip_syndic WHERE id_syndic='$id_syndic' AND syndication IN ('oui', 'sus', 'off')");
if ($result AND spip_num_rows($result)>0)
$erreur_syndic = syndic_a_jour ($id_syndic);
@@ -367,7 +367,7 @@
debut_boite_info();
echo _T('avis_site_syndique_probleme', array('url_syndic' => $url_syndic));
echo "<center><b>";
- echo "<a href='sites.php3?id_syndic=$id_syndic&recalcul=oui'>";
+ echo "<a href='sites.php3?id_syndic=$id_syndic&reload=oui'>";
echo _T('lien_nouvelle_recuperation')."</a></b></center>\n";
fin_boite_info();
}
@@ -379,7 +379,7 @@
// afficher la date de dernier acces a la syndication
if ($date_syndic)
echo "<p><div align='left'>"._T('info_derniere_syndication').' '.affdate_heure($date_syndic)
- .".</div><div align='right'><a href='sites.php3?id_syndic=$id_syndic&recalcul=oui'>"._T('lien_mise_a_jour_syndication')."</a></div>\n";
+ .".</div><div align='right'><a href='sites.php3?id_syndic=$id_syndic&reload=oui'>"._T('lien_mise_a_jour_syndication')."</a></div>\n";
// modifier la moderation
if ($flag_administrable && $options=='avancees') {
@@ -423,7 +423,7 @@
echo "</select>\n";
echo aide("rubsyn");
echo '<input type="hidden" name="modifier_site" value="oui" />';
- echo '<input type="hidden" name="recalcul" value="oui" />';
+ echo '<input type="hidden" name="reload" value="oui" />';
echo "<div align='$spip_lang_right'><input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo'></div>\n";
echo fin_cadre_relief();
echo "</div></form>\n";