diff --git a/ecrire/exec/config_fonctions.php b/ecrire/exec/config_fonctions.php index 163ef10c6ccc57eb72a532129fb2b1ed3476608e..0aafe9783605f007cda179766fc35cee7e289f4c 100644 --- a/ecrire/exec/config_fonctions.php +++ b/ecrire/exec/config_fonctions.php @@ -34,7 +34,7 @@ function exec_config_fonctions_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_config_fonctions'), "configuration", "configuration"); - echo "<br><br><br>"; + echo "<br /><br /><br />"; gros_titre(_T('titre_config_fonctions')); echo barre_onglets("configuration", "fonctions"); @@ -132,7 +132,7 @@ function afficher_choix_vignette($process) { } $retour .= "<td width='".($taille_preview+4)."'><div align='center' valign='bottom' width='".($taille_preview+4)."'". - ($border ? "style='border:2px;border-style: dotted; border-color: $couleur_foncee;'" : ''). + ($border ? " style='border:2px;border-style: dotted; border-color: $couleur_foncee;'" : ''). "><a href='" . generer_url_ecrire("config_fonctions", "image_process=$process"). "'><img src='". generer_url_action("tester", "arg=$process"). "' /></a><br />"; @@ -248,21 +248,22 @@ function vignettes_config() else $style = "display: none;"; echo "<div id='config-preview' class='verdana2' style='$style margin-$spip_lang_left: 40px;'>"._T('info_taille_maximale_vignette'); - echo "<br> <INPUT TYPE='text' NAME='taille_preview' VALUE='$taille_preview' class='fondl' size=5>"; + echo "<br /> <input type='text' name='taille_preview' value='$taille_preview' class='fondl' size='5' />"; echo " "._T('info_pixels').'<br /><br /></div>'; $block= "'none', 'block'"; echo bouton_radio("creer_preview", "non", _T('item_choix_non_generation_miniature'), $creer_preview != "oui", "changeVisible(this.checked, 'config-preview', $block);"); - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; + echo "</p>"; + fin_cadre_trait_couleur(); } fin_cadre_trait_couleur(); - echo "<p>"; } // http://doc.spip.org/@moteur_config @@ -284,7 +285,7 @@ function moteur_config() array('oui' => _T('item_utiliser_moteur_recherche'), 'non' => _T('item_non_utiliser_moteur_recherche')), ' '); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); @@ -309,7 +310,7 @@ afficher_choix('activer_statistiques', $activer_statistiques, array('oui' => _T('item_gerer_statistiques'), 'non' => _T('item_non_gerer_statistiques')), ' '); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); @@ -334,7 +335,7 @@ function notification_config() array('oui' => _T('item_activer_messages_avertissement'), 'non' => _T('item_non_activer_messages_avertissement'))); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); @@ -359,7 +360,7 @@ function versions_config() array('oui' => _T('info_historique_activer'), 'non' => _T('info_historique_desactiver'))); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); @@ -390,7 +391,7 @@ function correcteur_config() array('oui' => _T('info_ortho_activer'), 'non' => _T('info_ortho_desactiver'))); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); @@ -420,7 +421,7 @@ function previsu_config() ) ); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); @@ -445,26 +446,25 @@ function proxy_config() echo "</div>"; echo "<div class='verdana2'>"; - echo "<INPUT TYPE='text' NAME='http_proxy' VALUE='$http_proxy' size='40' class='forml'>"; + echo "<input type='text' name='http_proxy' value='$http_proxy' size='40' class='forml' />"; if ($http_proxy) { - echo "<p align='$spip_lang_left'><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=2 COLOR='#000000'>" + echo "<p align='$spip_lang_left'><font face='Verdana,Arial,Sans,sans-serif' size='2' color='#000000'>" . _T('texte_test_proxy'); echo "</p>"; echo "<p>"; - echo "<INPUT TYPE='text' NAME='test_proxy' VALUE='http://www.spip.net/' size='40' class='forml'>"; + echo "<input type='text' name='test_proxy' value='http://www.spip.net/' size='40' class='forml' />"; echo "</p>"; - echo "<div style='text-align: $spip_lang_right;'><INPUT TYPE='submit' NAME='tester_proxy' VALUE='"._T('bouton_test_proxy')."' CLASS='fondo'></div>"; + echo "<div style='text-align: $spip_lang_right;'><input type='submit' name='tester_proxy' value='"._T('bouton_test_proxy')."' class='fondo' /></div>"; } echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); - echo "<p>"; } // http://doc.spip.org/@htpasswd_config @@ -488,11 +488,9 @@ function htpasswd_config() 'non' => _T('item_non_creer_fichiers_authent')), ' '); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); - - echo "<p>"; } ##### n'est pas encore utilise ####### @@ -517,7 +515,7 @@ function htaccess_config() 'non' => _L("autoriser la lecture")), ' '); echo "</div>"; - echo "<div style='text-align:$spip_lang_right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'></div>"; + echo "<div style='text-align:$spip_lang_right'><input type='submit' value='"._T('bouton_valider')."' class='fondo' /></div>"; fin_cadre_trait_couleur(); diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php index d26803b94d7172b63d48085eec5653e37b38f59d..e2d190572026a9021cc050813d5a6683099b8018 100644 --- a/ecrire/inc/minipres.php +++ b/ecrire/inc/minipres.php @@ -297,9 +297,10 @@ function http_wrapper($img){ } // http://doc.spip.org/@http_img_pack function http_img_pack($img, $alt, $att, $title='') { + return "<img src='" . http_wrapper($img) . ("'\nalt=\"" . - textebrut($alt ? str_replace('"','',$alt) : ($title ? $title : '')) + str_replace('"','', ($alt ? $alt : ($title ? $title : ''))) . '" ') . ($title ? " title=\"$title\"" : '') . $att