Browse Source

Renommage des icones de page et de bloc.

Ajout de la noisette navart pour la navigation dans les articles d'une même rubrique.
v0
eric@smellup.net 3 years ago
parent
commit
53d04ecff0
  1. 31
      .gitattributes
  2. 2
      aside/bloc.yaml
  3. 1
      aside/dist.html
  4. 2
      breadcrumb/bloc.yaml
  5. 7
      content/401.html
  6. 2
      content/401.yaml
  7. 6
      content/404.html
  8. 2
      content/404.yaml
  9. 2
      content/bloc.yaml
  10. 47
      content/meteo.html
  11. 2
      content/meteo.yaml
  12. 2
      content/sommaire.yaml
  13. 2
      extra/bloc.yaml
  14. 2
      footer/bloc.yaml
  15. 2
      header/bloc.yaml
  16. 9
      lang/zgala_fr.php
  17. 2
      nav/bloc.yaml
  18. 10
      noisettes/navart-preview.html
  19. 3
      noisettes/navart.html
  20. 6
      noisettes/navart.yaml
  21. 11
      noisettes/navbar-preview.html
  22. 10
      noisettes/navrub-preview.html
  23. 3
      noisettes/navrub.html
  24. 6
      noisettes/navrub.yaml
  25. 7
      noisettes/rubrique-articles.html
  26. 12
      noisettes/rubrique-articles.yaml
  27. 2
      paquet.xml
  28. BIN
      prive/themes/spip/images/bloc_aside-24.png
  29. BIN
      prive/themes/spip/images/bloc_breadcrumb-24.png
  30. BIN
      prive/themes/spip/images/bloc_content-24.png
  31. BIN
      prive/themes/spip/images/bloc_extra-24.png
  32. BIN
      prive/themes/spip/images/bloc_footer-24.png
  33. BIN
      prive/themes/spip/images/bloc_header-24.png
  34. BIN
      prive/themes/spip/images/bloc_nav-24.png
  35. BIN
      prive/themes/spip/images/content-24.png
  36. BIN
      prive/themes/spip/images/contenu-24.png
  37. BIN
      prive/themes/spip/images/navrub-24.png
  38. BIN
      prive/themes/spip/images/navrub-32.png
  39. 0
      prive/themes/spip/images/page_401-24.png
  40. 0
      prive/themes/spip/images/page_401-32.png
  41. 0
      prive/themes/spip/images/page_404-24.png
  42. 0
      prive/themes/spip/images/page_404-32.png
  43. 0
      prive/themes/spip/images/page_boite-32.png
  44. 0
      prive/themes/spip/images/page_meteo-24.png
  45. 0
      prive/themes/spip/images/page_meteo-32.png
  46. 0
      prive/themes/spip/images/page_sommaire-24.png
  47. 0
      prive/themes/spip/images/page_sommaire-32.png
  48. 0
      prive/themes/spip/images/page_tinytypo-32.png

31
.gitattributes

@ -3,24 +3,31 @@ css/img/message_erreur-24.png -text
css/img/message_info-24.png -text
css/img/message_notice-24.png -text
css/img/message_ok-24.png -text
prive/themes/spip/images/401-24.png -text
prive/themes/spip/images/401-32.png -text
prive/themes/spip/images/404-24.png -text
prive/themes/spip/images/404-32.png -text
prive/themes/spip/images/bienvenue.png -text
prive/themes/spip/images/boite-32.png -text
prive/themes/spip/images/bloc_aside-24.png -text
prive/themes/spip/images/bloc_breadcrumb-24.png -text
prive/themes/spip/images/bloc_content-24.png -text
prive/themes/spip/images/bloc_extra-24.png -text
prive/themes/spip/images/bloc_footer-24.png -text
prive/themes/spip/images/bloc_header-24.png -text
prive/themes/spip/images/bloc_nav-24.png -text
prive/themes/spip/images/breadcrumb.png -text
prive/themes/spip/images/content-24.png -text
prive/themes/spip/images/contenu-24.png -text
prive/themes/spip/images/menu.png -text
prive/themes/spip/images/meteo-24.png -text
prive/themes/spip/images/meteo-32.png -text
prive/themes/spip/images/navbar-24.png -text
prive/themes/spip/images/navbar-32.png -text
prive/themes/spip/images/navrub-24.png -text
prive/themes/spip/images/navrub-32.png -text
prive/themes/spip/images/page-24.png -text
prive/themes/spip/images/page-32.png -text
prive/themes/spip/images/sommaire-24.png -text
prive/themes/spip/images/sommaire-32.png -text
prive/themes/spip/images/tinytypo-32.png -text
prive/themes/spip/images/page_401-24.png -text
prive/themes/spip/images/page_401-32.png -text
prive/themes/spip/images/page_404-24.png -text
prive/themes/spip/images/page_404-32.png -text
prive/themes/spip/images/page_boite-32.png -text
prive/themes/spip/images/page_meteo-24.png -text
prive/themes/spip/images/page_meteo-32.png -text
prive/themes/spip/images/page_sommaire-24.png -text
prive/themes/spip/images/page_sommaire-32.png -text
prive/themes/spip/images/page_tinytypo-32.png -text
prive/themes/spip/images/vedette.png -text
/zgala_logo-32.png -text

2
aside/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_aside_titre:>'
description: '<:zgala:bloc_aside_description:>'
icone: 'aside.png'
icone: 'bloc_aside.png'

1
aside/dist.html

@ -1 +0,0 @@
<p><strong>2) Navigation here.</strong> long long fill filler very fill column column silly filler very filler fill fill filler text fill very silly fill text filler silly silly filler fill very make fill column text column very very column fill fill very silly column silly silly fill fill long filler </p>

2
breadcrumb/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_breadcrumb_titre:>'
description: '<:zgala:bloc_breadcrumb_description:>'
icone: 'breadcrumb.png'
icone: 'bloc_breadcrumb.png'

7
content/401.html

@ -0,0 +1,7 @@
<div class="contenu-principal">
<div class="cartouche">
<h1 class="h1"><:pass_erreur:>[ (#ENV{status})]</h1>
</div>
[<div class="chapo">(#ENV{erreur})</div>]
#FORMULAIRE_LOGIN{#ENV{cible},'',0}
</div>

2
content/401.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:page_401_titre:>'
description: '<:zgala:page_401_description:>'
icon: '401.png'
icon: 'page_401.png'

6
content/404.html

@ -0,0 +1,6 @@
<div class="contenu-principal">
<div class="cartouche">
<h1 class="h1"><:pass_erreur:> 404</h1>
</div>
[<div class="chapo">(#ENV{erreur})</div>]
</div>

2
content/404.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:page_404_titre:>'
description: '<:zgala:page_404_description:>'
icon: '404.png'
icon: 'page_404.png'

2
content/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_content_titre:>'
description: '<:zgala:bloc_content_description:>'
icone: 'content.png'
icone: 'bloc_content.png'

47
content/meteo.html

@ -1,45 +1,6 @@
[(#REM)
Partie contenu de la page meteo affichant les conditions temps reels, la previsions du jour
et les previsions des n prochains jours
Parametres d'appel :
- le code de la ville nomme "ville"
- le service a utiliser
Partie contenu de la page meteo.
]
[(#REM) Fil d'Ariane ]
<p id="hierarchie"><a href="#URL_SITE_SPIP/"><:accueil_site:></a> &gt; <strong class="on"><:rainette:meteo|ucfirst:></strong></p>
#SET{nom_ville, #RAINETTE_INFOS{#ENV{ville, FRXX0076}, ville, #ENV{service, weather}}}
#SET{pays, #RAINETTE_INFOS{#ENV{pays, FRXX0076}, pays, #ENV{service, weather}}}
[(#SET{nom_ville, [(#GET{nom_ville})[, (#GET{pays})]]})]
<div class="cartouche">
<h1 class="h1"><:rainette:meteo_consultation{ville=#GET{nom_ville}}:></h1>
<p class="info-publi">
<small>
[<:rainette:longitude|ucfirst:>&nbsp;(#RAINETTE_INFOS{
#ENV{ville, FRXX0076},
longitude,
#ENV{service, weather}}|rainette_afficher_unite{angle, 2, #ENV{service, weather}})]
[, <:rainette:latitude:>&nbsp;(#RAINETTE_INFOS{
#ENV{ville, FRXX0076},
latitude,
#ENV{service, weather}}|rainette_afficher_unite{angle, 2, #ENV{service, weather}})]
</small>
</p>
</div>
<br class="clear"/>
<h2 class="h2"><:rainette:meteo_conditions|ucfirst:></h2>
[(#MODELE{rainette_conditions,
lieu=#ENV{ville, FRXX0076},
sous_modele=conditions_tempsreel,
service=#ENV{service, weather}})]
<br class="clear"/>
<h2 class="h2"><:rainette:meteo_previsions_n_jours{nbj=#GET{max_previsions}}|ucfirst:></h2>
[(#MODELE{rainette_previsions,
lieu=#ENV{ville, FRXX0076},
premier_jour=1,
sous_modele=previsions_24h,
service=#ENV{service, weather}})]
<br class="clear"/>
<section class="meteo">
<!--noisettes-->
</section>

2
content/meteo.yaml

@ -1,5 +1,5 @@
nom: '<:zgala:page_meteo_titre:>'
description: '<:zgala:page_meteo_description:>'
icon: 'meteo-32.png'
icon: 'page_meteo.png'
necessite:
- 'rainette'

2
content/sommaire.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:page_sommaire_titre:>'
description: '<:zgala:page_sommaire_description:>'
icon: 'sommaire.png'
icon: 'page_sommaire.png'

2
extra/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_extra_titre:>'
description: '<:zgala:bloc_extra_description:>'
icone: 'extra.png'
icone: 'bloc_extra.png'

2
footer/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_footer_titre:>'
description: '<:zgala:bloc_footer_description:>'
icone: 'footer.png'
icone: 'bloc_footer.png'

2
header/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_header_titre:>'
description: '<:zgala:bloc_header_description:>'
icone: 'header.png'
icone: 'bloc_header.png'

9
lang/zgala_fr.php

@ -43,10 +43,15 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
'type_noisette_documents_titre' => 'Documents joints',
'type_noisette_forums_recents_description' => 'Résumé des commentaires récement postés',
'type_noisette_forums_recents_titre' => 'Commentaires récents',
'type_noisette_navart_description' => 'Menu des articles publiés dans une rubrique donnée portant l\'identifiant navart',
'type_noisette_navart_titre' => 'Menu des articles d\'une rubrique',
'type_noisette_navbar_description' => 'Barre horizontale de navigation principale portant l\'identifiant navbar',
'type_noisette_navbar_titre' => 'Barre de navigation principale',
'type_noisette_navrub_description' => 'Menu arborescents des rubriques du site portant l\'identifiant navbar',
'type_noisette_navrub_titre' => 'Menu des rubriques',
'type_noisette_portfolio_description' => 'Liste des images incluses dans le portfolio d\'un article ou d\'une rubrique',
'type_noisette_portfolio_titre' => 'Portfolio d\'images',
'type_noisette_rubrique_articles_description' => 'Liste des articles de la rubrique avec résumé',
'type_noisette_rubrique_articles_titre' => 'Articles de la rubrique',
'type_noisette_rubrique_cartouche_titre' => 'Cartouche',
'type_noisette_rubrique_main_titre' => 'Contenu principal',
@ -73,8 +78,8 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
'preview_bienvenue_ok_avec_article' => 'Article @article@ choisi',
'preview_bienvenue_ok_sans_article' => 'Article non choisi.',
'preview_forums_recents' => 'Nombre maximal de commentaires affichés : @max@',
'preview_navbar_ok' => 'Le menu d\'identifiant @menu@ a bien été créé.',
'preview_navbar_nok' => 'Le menu d\'identifiant @menu@ n\'a pas encore été créé. Suivre le lien pour le créer.',
'preview_menu_ok' => 'Le menu d\'identifiant @menu@ a bien été créé.',
'preview_menu_nok' => 'Le menu d\'identifiant @menu@ n\'a pas encore été créé. Suivre le lien pour le créer.',
'preview_selection_nok' => 'La sélection éditoriale @selection@ n\'a pas encore été créée. Suivre le lien pour la créer.',
'preview_vedette_ok' => 'La sélection éditoriale @selection@ permettant de mettre en exergue des articles a bien été créée. @articles@',
'preview_vedette_ok_avec_article' => 'Articles choisis : @articles@ (@max@ max)',

2
nav/bloc.yaml

@ -1,3 +1,3 @@
nom: '<:zgala:bloc_nav_titre:>'
description: '<:zgala:bloc_nav_description:>'
icone: 'nav.png'
icone: 'bloc_nav.png'

10
noisettes/navart-preview.html

@ -0,0 +1,10 @@
#SET{menu, navart}
<BOUCLE_navrub(MENUS){identifiant=#GET{menu}}>
[(#SET{url, [<a[ href="(#URL_ECRIRE{menu_edit,id_menu=#ID_MENU})"]><strong>(#GET{menu})</strong></a>]})]
<:zgala:preview_menu_ok{menu=#GET{url}}:>
</BOUCLE_navrub>
[(#SET{url, [<a[ href="(#URL_ECRIRE{menus})"]><strong>(#GET{menu})</strong></a>]})]
#BOITE_OUVRIR{'','notice'}
<:zgala:preview_menu_nok{menu=#GET{url}}:>
#BOITE_FERMER
<//B_navrub>

3
noisettes/navart.html

@ -0,0 +1,3 @@
[<div class="menu" id="navart">
(#INCLURE{fond=inclure/menu, identifiant=navart, env})
</div>]

6
noisettes/navart.yaml

@ -0,0 +1,6 @@
nom: '<:zgala:type_noisette_navart_titre:>'
description: '<:zgala:type_noisette_navart_description:>'
icon: 'menus_articles_rubrique.png'
contexte: 'id_rubrique'
ajax: 'non'
necessite: 'menus'

11
noisettes/navbar-preview.html

@ -1,9 +1,10 @@
<BOUCLE_navbar(MENUS){identifiant=navbar}>
[(#SET{url, <a[ href="(#URL_ECRIRE{menu_edit,id_menu=#ID_MENU})"]><strong>#IDENTIFIANT</strong></a>})]
<:zgala:preview_navbar_ok{menu=#GET{url}}:>
#SET{menu, navbar}
<BOUCLE_navbar(MENUS){identifiant=#GET{menu}}>
[(#SET{url, [<a[ href="(#URL_ECRIRE{menu_edit,id_menu=#ID_MENU})"]><strong>(#GET{menu})</strong></a>]})]
<:zgala:preview_menu_ok{menu=#GET{url}}:>
</BOUCLE_navbar>
[(#SET{url, <a[ href="(#URL_ECRIRE{menus})"]><strong>navbar</strong></a>})]
[(#SET{url, [<a[ href="(#URL_ECRIRE{menus})"]><strong>(#GET{menu})</strong></a>]})]
#BOITE_OUVRIR{'','notice'}
<:zgala:preview_navbar_nok{menu=#GET{url}}:>
<:zgala:preview_menu_nok{menu=#GET{url}}:>
#BOITE_FERMER
<//B_navbar>

10
noisettes/navrub-preview.html

@ -0,0 +1,10 @@
#SET{menu, navrub}
<BOUCLE_navrub(MENUS){identifiant=#GET{menu}}>
[(#SET{url, [<a[ href="(#URL_ECRIRE{menu_edit,id_menu=#ID_MENU})"]><strong>(#GET{menu})</strong></a>]})]
<:zgala:preview_menu_ok{menu=#GET{url}}:>
</BOUCLE_navrub>
[(#SET{url, [<a[ href="(#URL_ECRIRE{menus})"]><strong>(#GET{menu})</strong></a>]})]
#BOITE_OUVRIR{'','notice'}
<:zgala:preview_menu_nok{menu=#GET{url}}:>
#BOITE_FERMER
<//B_navrub>

3
noisettes/navrub.html

@ -0,0 +1,3 @@
[<div class="menu" id="navrub">
(#INCLURE{fond=inclure/menu, env, identifiant=navrub})
</div>]

6
noisettes/navrub.yaml

@ -0,0 +1,6 @@
nom: '<:zgala:type_noisette_navrub_titre:>'
description: '<:zgala:type_noisette_navrub_description:>'
icon: 'menus_rubriques.png'
contexte: 'aucun'
ajax: 'non'
necessite: 'menus'

7
noisettes/rubrique-articles.html

@ -1,9 +1,10 @@
<BOUCLE_rubrique_articles(RUBRIQUES){id_rubrique}>
<div class="main" id="articles">
<BOUCLE_articles(ARTICLES){id_rubrique}{0,1}>
<div class="liste articles">
<INCLURE{fond=liste/articles-resume,env,ajax,titre=<:articles_rubrique:>} />
<INCLURE{fond=liste/articles-resume,
titre=<:articles_rubrique:>,
max_articles=#ENV{max_articles},
env, ajax} />
</div>
</BOUCLE_articles>
</div>
</BOUCLE_rubrique_articles>

12
noisettes/rubrique-articles.yaml

@ -1,5 +1,13 @@
nom: '<:zgala:type_noisette_rubrique_articles_titre:>'
description: '<:zgala:type_noisette_description_rubrique_articles:>'
description: '<:zgala:type_noisette_rubrique_articles_description:>'
icon: 'rubrique.png'
contexte: 'id_rubrique'
ajax: 'non'
parametres:
-
saisie: 'input'
options:
nom: 'max_articles'
label: '<:zgala:saisie_max_articles_label:>'
maxlength: '1'
defaut: '6'

2
paquet.xml

@ -18,7 +18,7 @@
<necessite nom="zcore" compatibilite="[2.6.7;[" />
<necessite nom="saisies" compatibilite="[2.7.0;]" />
<necessite nom="noizetier" compatibilite="[3.0.51;]" />
<necessite nom="noizetier" compatibilite="[3.0.52;]" />
<necessite nom="menus" compatibilite="[1.7.15;]" />
<utilise nom="rainette" compatibilite="[3.5.7;]" />

BIN
prive/themes/spip/images/bloc_aside-24.png

After

Width: 24  |  Height: 24  |  Size: 642 B

BIN
prive/themes/spip/images/bloc_breadcrumb-24.png

After

Width: 24  |  Height: 24  |  Size: 634 B

BIN
prive/themes/spip/images/bloc_content-24.png

After

Width: 24  |  Height: 24  |  Size: 634 B

BIN
prive/themes/spip/images/bloc_extra-24.png

After

Width: 24  |  Height: 24  |  Size: 629 B

BIN
prive/themes/spip/images/bloc_footer-24.png

After

Width: 24  |  Height: 24  |  Size: 637 B

BIN
prive/themes/spip/images/bloc_header-24.png

After

Width: 24  |  Height: 24  |  Size: 642 B

BIN
prive/themes/spip/images/bloc_nav-24.png

After

Width: 24  |  Height: 24  |  Size: 634 B

BIN
prive/themes/spip/images/content-24.png

Before

Width: 24  |  Height: 24  |  Size: 753 B

BIN
prive/themes/spip/images/contenu-24.png

Before

Width: 24  |  Height: 24  |  Size: 753 B

BIN
prive/themes/spip/images/navrub-24.png

After

Width: 24  |  Height: 24  |  Size: 954 B

BIN
prive/themes/spip/images/navrub-32.png

After

Width: 32  |  Height: 32  |  Size: 201 B

0
prive/themes/spip/images/401-24.png → prive/themes/spip/images/page_401-24.png

Before

Width: 24  |  Height: 24  |  Size: 2.2 KiB

After

Width: 24  |  Height: 24  |  Size: 2.2 KiB

0
prive/themes/spip/images/401-32.png → prive/themes/spip/images/page_401-32.png

Before

Width: 32  |  Height: 32  |  Size: 2.5 KiB

After

Width: 32  |  Height: 32  |  Size: 2.5 KiB

0
prive/themes/spip/images/404-24.png → prive/themes/spip/images/page_404-24.png

Before

Width: 24  |  Height: 24  |  Size: 2.2 KiB

After

Width: 24  |  Height: 24  |  Size: 2.2 KiB

0
prive/themes/spip/images/404-32.png → prive/themes/spip/images/page_404-32.png

Before

Width: 32  |  Height: 32  |  Size: 2.6 KiB

After

Width: 32  |  Height: 32  |  Size: 2.6 KiB

0
prive/themes/spip/images/boite-32.png → prive/themes/spip/images/page_boite-32.png

Before

Width: 32  |  Height: 32  |  Size: 1.1 KiB

After

Width: 32  |  Height: 32  |  Size: 1.1 KiB

0
prive/themes/spip/images/meteo-24.png → prive/themes/spip/images/page_meteo-24.png

Before

Width: 24  |  Height: 24  |  Size: 1.7 KiB

After

Width: 24  |  Height: 24  |  Size: 1.7 KiB

0
prive/themes/spip/images/meteo-32.png → prive/themes/spip/images/page_meteo-32.png

Before

Width: 32  |  Height: 32  |  Size: 1.3 KiB

After

Width: 32  |  Height: 32  |  Size: 1.3 KiB

0
prive/themes/spip/images/sommaire-24.png → prive/themes/spip/images/page_sommaire-24.png

Before

Width: 24  |  Height: 24  |  Size: 1.9 KiB

After

Width: 24  |  Height: 24  |  Size: 1.9 KiB

0
prive/themes/spip/images/sommaire-32.png → prive/themes/spip/images/page_sommaire-32.png

Before

Width: 32  |  Height: 32  |  Size: 1.5 KiB

After

Width: 32  |  Height: 32  |  Size: 1.5 KiB

0
prive/themes/spip/images/tinytypo-32.png → prive/themes/spip/images/page_tinytypo-32.png

Before

Width: 32  |  Height: 32  |  Size: 1.4 KiB

After

Width: 32  |  Height: 32  |  Size: 1.4 KiB

Loading…
Cancel
Save