diff --git a/dist/prive/article_infos.html b/dist/prive/article_infos.html index 0c39a8a0c6fcc1f7c091d700b108c07bc43490d0..745b9e17f92be0fa399cacdce86a5e794af69cd4 100644 --- a/dist/prive/article_infos.html +++ b/dist/prive/article_infos.html @@ -3,9 +3,9 @@ <div class='numero'><:info_numero_article:><p>#ID_ARTICLE</p></div> [(#ID_ARTICLE|instituer_article{#ID_RUBRIQUE,#STATUT})] <p class='origine'>[(#DATE|affdate)][<br /><:par_auteur:><span class='lesauteurs'> (#LESAUTEURS|couper{150})]</span><p> -<BOUCLE_docs(DOCUMENTS){id_article}></BOUCLE_docs><p class='nb_docs'>#TOTAL_BOUCLE <:documents:></p><//B_docs> -<p class='statistiques'>Cet article a une popularite de #POPULARITE et a reçu #VISITES visites</p> -<BOUCLE_forums(FORUMS){id_article}></BOUCLE_forums>[<p class='forums'>(#VAL{icone_suivi_forum}|_T{#ARRAY{nb_forums,#TOTAL_BOUCLE}})</p>]<//B_forums> -<BOUCLE_sign(SIGNATURES){id_article}{statut IN publie,poubelle}></BOUCLE_sign><p class='signatues'>#TOTAL_BOUCLE <:info_signatures:></p><//B_sign> +<BOUCLE_docs(DOCUMENTS){id_article}></BOUCLE_docs><p class='nb_elements[(#TOTAL_BOUCLE|?{'',' noinfo'})]'>#TOTAL_BOUCLE <:info_documents:></p><//B_docs> +<p class='statistiques[(#VISITES|?{'',' noinfo'})]'>Cet article a une popularite de #POPULARITE et a reçu #VISITES visites</p> +<BOUCLE_forums(FORUMS){id_article}></BOUCLE_forums>[<p class='forums[(#TOTAL_BOUCLE|?{'',' noinfo'})]'>(#VAL{icone_suivi_forum}|_T{#ARRAY{nb_forums,#TOTAL_BOUCLE}})</p>]<//B_forums> +<BOUCLE_sign(SIGNATURES){id_article}{statut IN publie,poubelle}></BOUCLE_sign><p class='signatues[(#TOTAL_BOUCLE|?{'',' noinfo'})]'>#TOTAL_BOUCLE <:info_signatures:></p><//B_sign> </div> </BOUCLE_art> \ No newline at end of file diff --git a/dist/prive/breve_infos.html b/dist/prive/breve_infos.html index 6d04bab7e0784c17ea5848f573fa3b9cbc4a8559..bc2724e1613905e1f0748709c220c85418e4bae0 100644 --- a/dist/prive/breve_infos.html +++ b/dist/prive/breve_infos.html @@ -3,7 +3,7 @@ <div class='numero'><:info_gauche_numero_breve:><p>#ID_BREVE</p></div> [(#ID_BREVE|instituer_breve{#ID_RUBRIQUE,#STATUT})] <p class='origine'>[(#DATE|affdate)]</span><p> -<BOUCLE_docs(DOCUMENTS){id_breve}></BOUCLE_docs><p class='nb_docs'>#TOTAL_BOUCLE <:documents:></p><//B_docs> -<p class='forums'>xx messages de forums</p> +<BOUCLE_docs(DOCUMENTS){id_breve}></BOUCLE_docs><p class='nb_elements[(#TOTAL_BOUCLE|?{'',' noinfo'})]'>#TOTAL_BOUCLE <:info_documents:></p><//B_docs> +<BOUCLE_forums(FORUMS){id_breve}></BOUCLE_forums>[<p class='forums[(#TOTAL_BOUCLE|?{'',' noinfo'})]'>(#VAL{icone_suivi_forum}|_T{#ARRAY{nb_forums,#TOTAL_BOUCLE}})</p>]<//B_forums> </div> </BOUCLE_breve> \ No newline at end of file diff --git a/dist/prive/rubrique_infos.html b/dist/prive/rubrique_infos.html index 53b4ad160315b4af48f8185d2689794dff3605da..eb67be8f7e116bc3cb4b83d6a9f5a48e2f7f6d8b 100644 --- a/dist/prive/rubrique_infos.html +++ b/dist/prive/rubrique_infos.html @@ -1,7 +1,12 @@ <BOUCLE_rub(RUBRIQUES){id_rubrique=#ENV{id}}{statut?}> <div class='infos'> <div class='numero'><:titre_numero_rubrique:><p>#ID_RUBRIQUE</p></div> -<BOUCLE_docs(DOCUMENTS){id_article}></BOUCLE_docs><p class='nb_docs'>#TOTAL_BOUCLE <:documents:></p><//B_docs> +<p class='nb_elements'> +<BOUCLE_arts(ARTICLES){id_rubrique}{statut!=poubelle}></BOUCLE_arts><div[(#TOTAL_BOUCLE|?{'',' class="noinfo"'})]>#TOTAL_BOUCLE <:info_articles:></div><//B_arts> +<BOUCLE_breves(BREVES){id_rubrique}{statut!=poubelle}></BOUCLE_breves><div[(#TOTAL_BOUCLE|?{'',' class="noinfo"'})]>#TOTAL_BOUCLE <:info_breves_02:></div><//B_breves> +<BOUCLE_sites(SITES){id_rubrique}{statut!=poubelle}></BOUCLE_sites><div[(#TOTAL_BOUCLE|?{'',' class="noinfo"'})]>#TOTAL_BOUCLE <:info_sites:></div><//B_sites> +<BOUCLE_docs(DOCUMENTS){id_rubrique}></BOUCLE_docs><div[(#TOTAL_BOUCLE|?{'',' class="noinfo"'})]>#TOTAL_BOUCLE <:info_documents:></div><//B_docs> +</p> [<p class='forums'>(#ENV{n_forums,''}|?{' '})[(#VAL{icone_suivi_forum}|_T{#ARRAY{nb_forums,#ENV{n_forums}}})]</p>] </div> </BOUCLE_rub> \ No newline at end of file diff --git a/dist/prive/site_infos.html b/dist/prive/site_infos.html index 410b8266e4f1319c03e658a7da3391fd3885c542..d7e3c721f1ce67a1ad0509687f870a4692f61bc4 100644 --- a/dist/prive/site_infos.html +++ b/dist/prive/site_infos.html @@ -2,8 +2,6 @@ <div class='infos'> <div class='numero'><:titre_site_numero:><p>#ID_SYNDIC</p></div> [(#ID_SYNDIC|instituer_site{#ID_RUBRIQUE,#STATUT})] -<BOUCLE_docs(DOCUMENTS){id_syndic}></BOUCLE_docs><p class='nb_docs'>#TOTAL_BOUCLE <:documents:></p><//B_docs> -<p class='forums'>xx messages de forums</p> -<p class='signatues'>xx signatures</p> +<BOUCLE_forums(FORUMS){id_syndic}></BOUCLE_forums>[<p class='forums[(#TOTAL_BOUCLE|?{'',' noinfo'})]'>(#VAL{icone_suivi_forum}|_T{#ARRAY{nb_forums,#TOTAL_BOUCLE}})</p>]<//B_forums> </div> </BOUCLE_site> \ No newline at end of file diff --git a/dist/style_prive.html b/dist/style_prive.html index 10441ee9f84b54d3a0207070bea6bb70be3a90d0..064fedaf39fb089416f7292d562061dc341764a3 100644 --- a/dist/style_prive.html +++ b/dist/style_prive.html @@ -676,6 +676,7 @@ div.puce_breve_popup, span.puce_breve_popup { width: 27px; } #contenu #wysiwyg span p { margin-top: 0; } #navigation .infos .numero { font-size: x-small;font-weight: bold; text-align: center; } #navigation .infos .numero p { font-size: x-large; margin:5px 0;color:#333; font-family: verdana, helvetica, arial, sans; } +#navigation .infos .noinfo { color:#ddd;} #contenu .bandeau_actions {border-top: 1px solid #eee; border-bottom: 1px solid #eee; margin:5px 0;clear:both; } #contenu .bandeau_actions a:hover { background: #FFF; } #contenu .logo_titre { float: #GET{right}; margin: 5px 0; margin-#GET{left}: 5px; } diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php index 7ffcd77ae20e42d5952718c542f46ffd5cae760a..3e6ef2fd57a44adf7b9fdb157c3aa1254fac03c3 100644 --- a/ecrire/exec/naviguer.php +++ b/ecrire/exec/naviguer.php @@ -159,7 +159,7 @@ function exec_naviguer_dist() $onglet_enfants = afficher_enfant_rub($id_rubrique, false, true) - .(_INTERFACE_ONGLETS?"<br class='nettoyeur' />": + .(_INTERFACE_ONGLETS?"": (autoriser('creerrubriquedans','rubrique',$id_rubrique)? (!$id_rubrique ? icone_inline(_T('icone_creer_rubrique'), generer_url_ecrire("rubriques_edit","new=oui&retour=nav"), "secteur-24.gif", "creer.gif",$spip_lang_right) @@ -193,8 +193,7 @@ function exec_naviguer_dist() 'voir' =>_L('Contenu'), 'props' => _L('Propriétés'), 'docs' => _L('Documents'), - 'interactivite' => _L('Interactivité'), - 'discuter' => _L('Discuter')), + 'interactivite' => _L('Interactivité')), array( 'voir'=>$onglet_contenu, 'sousrub'=>$onglet_enfants, @@ -382,7 +381,7 @@ function contenu_naviguer($id_rubrique, $id_parent) { $n = spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1")); $bouton_article = $bouton_breves = $bouton_sites = ""; - if ($n) { + if ($n && !_INTERFACE_ONGLETS) { if (autoriser('creerarticledans','rubrique',$id_rubrique)) $bouton_article .= icone_inline(_T('icone_ecrire_article'), generer_url_ecrire("articles_edit","id_rubrique=$id_rubrique&new=oui"), "article-24.gif","creer.gif", $spip_lang_right) . "<br class='nettoyeur' />"; diff --git a/ecrire/inc/afficher_contenu_objet.php b/ecrire/inc/afficher_contenu_objet.php index 71835f60775236c79e481c83b57454a3f7cbc709..23da7afe33cbd92a258622aadbb4976c35db47ae 100644 --- a/ecrire/inc/afficher_contenu_objet.php +++ b/ecrire/inc/afficher_contenu_objet.php @@ -70,7 +70,7 @@ function inc_afficher_contenu_objet_dist($type, $id,$row = NULL){ else { $balise = strtoupper($champ); if (isset($table_des_traitements[$balise])) { - $filtre = end($table_des_traitements[$balise]); + $filtre = isset($table_des_traitements[$balise][$table])?$table_des_traitements[$balise][$table]:$table_des_traitements[$balise][0]; $filtre = str_replace('%s',"'".addslashes($valeur)."'", $filtre); $valeur = eval("return $filtre;"); }