Browse Source

distributions, grappe, recherche, crayons

master
Cerdic 10 months ago
parent
commit
e4fdd1a653
17 changed files with 115 additions and 68 deletions
  1. +0
    -1
      .gitattributes
  2. +0
    -4
      content/distributions.html
  3. +2
    -10
      content/grappe.html
  4. +6
    -13
      content/traduction_recherche.html
  5. +1
    -0
      extra/traduction_recherche.html
  6. +1
    -1
      inclure/recherche.html
  7. +8
    -6
      noisettes/listes/tradlang_bilan_priorite.html
  8. +18
    -20
      noisettes/listes/tradlang_liste_recherche.html
  9. +21
    -0
      theme/css/_components.scss
  10. +25
    -1
      theme/css/_content.scss
  11. +2
    -2
      theme/css/_variables.scss
  12. +1
    -0
      top/article.html
  13. +3
    -0
      top/distributions.html
  14. +15
    -0
      top/grappe.html
  15. +0
    -10
      top/recherche.html
  16. +5
    -0
      top/rubrique.html
  17. +7
    -0
      top/traduction_recherche.html

+ 0
- 1
.gitattributes View File

@@ -164,7 +164,6 @@ top/article.html -text
top/auteur.html -text
top/dist.html -text
top/login.html -text
top/recherche.html -text
top/signalements.html -text
top/sommaire.html -text
top/tradlang_bilan.html -text


+ 0
- 4
content/distributions.html View File

@@ -1,7 +1,3 @@
<div class="cartouche">
<h1 class="h1"><:tradlang:titre_distributions:></h1>
</div>

<B_grappes>
<div class="liste resume articles">
#ANCRE_PAGINATION


+ 2
- 10
content/grappe.html View File

@@ -17,18 +17,10 @@

#SET{langues,#GET{langues}|langues_sort}

[(#REM) Fil d'Ariane ]
<p id="hierarchie"><a href="#URL_SITE_SPIP/"><:accueil_site:></a><span class="sep"> &gt; </span><a href="#URL_PAGE{distributions}" class="spip_in"><:tradlang:info_distributions:></a>[<span class="sep"> &gt; </span><strong class="on">(#TITRE|couper{80})</strong>]</p>

<div class="content-principal">
<div class="cartouche">
[(#LOGO_GRAPPE|image_reduire{200,200})]
<h1 class="h1">#TITRE</h1>
[(#FORMULAIRE_FAVORI{grappe,#ID_GRAPPE})]
</div>
[<div class="#EDIT{descriptif} texte chapo">(#DESCRIPTIF)</div>]

[(#FORMULAIRE_TRADLANG_SWITCHER_LANGUE{'',#GET{langues_preferees},<:tradlang:titre_changer_langues_affichees:>,'langues_choisies',true})]
[<div class="#EDIT{descriptif} texte descriptif">(#DESCRIPTIF)</div>]
<BOUCLE_tradlang_bilans(TRADLANG_MODULES){fusion priorite}>
<INCLURE{fond=noisettes/listes/tradlang_bilan_priorite,id_grappe,priorite,langues=#GET{langues}} />
</BOUCLE_tradlang_bilans>


+ 6
- 13
content/traduction_recherche.html View File

@@ -1,13 +1,6 @@
<div class="contenu-principal">
<div id="hierarchie"><a href="#URL_PAGE{tradlang_bilan}"><:tradlang:lien_accueil_interface:></a></div>
[<div class="cartouche">
<h1 class="h1"><:resultats_recherche:></h1>
<p class="soustitre">&#171;&nbsp;(#RECHERCHE)&nbsp;&#187;</p>
[(#PLUGIN{Fulltext}|oui)<p><a href="#URL_PAGE{aide_recherche}" class="btn aide mediabox"><:tradlang:lien_aide_recherche:></a></p>]
</div>]

#FORMULAIRE_TRADLANG_RECHERCHE_AVANCEE{#URL_PAGE{traduction_recherche}}

#SET{langues_possibles,#EVAL{$GLOBALS['codes_langues']}|array_keys}
<INCLURE{fond=noisettes/listes/tradlang_liste_recherche,langues_possibles=#GET{langues_possibles},env,ajax}>
</div>
<section class="contenu-principal">
<div class="main">
#SET{langues_possibles,#EVAL{$GLOBALS['codes_langues']}|array_keys}
<INCLURE{fond=noisettes/listes/tradlang_liste_recherche,langues_possibles=#GET{langues_possibles},env,ajax}>
</div>
</section>

+ 1
- 0
extra/traduction_recherche.html View File

@@ -0,0 +1 @@
#FORMULAIRE_TRADLANG_RECHERCHE_AVANCEE{#URL_PAGE{traduction_recherche}}

+ 1
- 1
inclure/recherche.html View File

@@ -1 +1 @@
#FORMULAIRE_RECHERCHE
#FORMULAIRE_RECHERCHE{#URL_PAGE{traduction_recherche}}

+ 8
- 6
noisettes/listes/tradlang_bilan_priorite.html View File

@@ -1,12 +1,12 @@
<BOUCLE_modules_priorite(TRADLANG_MODULES){id_grappe ?}{priorite}{0,1}> </BOUCLE_modules_priorite>
<h3 class="h3">#PRIORITE[ ((#GRAND_TOTAL))]</h3>
[<div class="description description_priorite[ (#EDIT_CONFIG{tradlang/[(#PRIORITE|supprimer_numero|replace{' ','_'})]})]">(#CONFIG{tradlang/[(#PRIORITE|supprimer_numero|replace{' ','_'})]}|propre)</div>]
<h2>#PRIORITE[ ((#GRAND_TOTAL))]</h2>
[<div class="chapo description_priorite[ (#EDIT_CONFIG{tradlang/[(#PRIORITE|supprimer_numero|replace{' ','_'})]})]">(#CONFIG{tradlang/[(#PRIORITE|supprimer_numero|replace{' ','_'})]}|propre)</div>]
<B_langues_totales>
<div class="bilan">
<div class="bilan table-wraper">
<table class="spip liste ss_tablesort">
<thead>
<tr class="row_first">
<th><:tradlang:th_module:></th>
<th colspan="2"><:tradlang:th_module:></th>
<th><:tradlang:th_langue_mere:></th><BOUCLE_langues_totales(DATA){source tableau, #ENV{langues}}>
<th class="lang #CLE">[(#SET{langue_longue_#CLE,[(#CLE|traduire_nom_langue)]})][(#SET{langue_dir_#CLE,[(#CLE|lang_dir)]})]
<a href="[(#SELF|parametre_url{id_tradlang_module,''}|parametre_url{langue_modules,#CLE})]" title="<:tradlang:lien_voir_bilan_lang{lang=#CLE,langue_longue=#GET{langue_longue_#CLE}}|attribut_html:>">[(#CLE)]</a>
@@ -15,7 +15,8 @@
</thead>
<tbody><BOUCLE_modules_lang(TRADLANG_MODULES){id_grappe ?}{priorite}>
<tr class="module #MODULE[ (#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]">#SET{url_module,#URL_TRADLANG_MODULE}
<td class="#EDIT{nom_mod}">[(#FORMULAIRE_FAVORI{tradlang_module,#ID_TRADLANG_MODULE}) ]<a href="#GET{url_module}" title="<:tradlang:lien_voir_bilan_module{module=#MODULE,nom_mod=#NOM_MOD}|attribut_html:>">[(#NOM_MOD)]</a></td>
<td class="#EDIT{nom_mod}"><a href="#GET{url_module}" title="<:tradlang:lien_voir_bilan_module{module=#MODULE,nom_mod=#NOM_MOD}|attribut_html:>">[(#NOM_MOD)]</a></td>
<td>[(#FORMULAIRE_FAVORI{tradlang_module,#ID_TRADLANG_MODULE})]</td>
[(#SET{full,''})][(#SET{langue_mere,#LANG_MERE})]
<BOUCLE_compte_langue_mere(TRADLANGS){id_tradlang_module}{lang=#LANG_MERE}> </BOUCLE_compte_langue_mere>
<td><abbr title="[(#GET{langue_mere}|traduire_nom_langue)]">[(#GET{langue_mere})]</abbr> [((#GRAND_TOTAL))]</td>[(#SET{full,#GRAND_TOTAL})]</B_compte_langue_mere>
@@ -36,7 +37,7 @@
</tbody>
<tfoot>
<tr>
<td><:tradlang:tfoot_total:></td>
<td colspan="2"><:tradlang:tfoot_total:></td>
<td></td>
<BOUCLE_langues_tfoot(DATA){source table, #ENV{langues}}>
<td>[(#GET{total_#CLE}|div{#GET{total_modules}}|floor)%]</td></BOUCLE_langues_tfoot>
@@ -44,4 +45,5 @@
</tfoot>
</table>
</div>
<hr />
</B_modules_priorite>

+ 18
- 20
noisettes/listes/tradlang_liste_recherche.html View File

@@ -31,47 +31,45 @@
<table class="spip liste_traductions ss_tablesort">
<thead>
<tr class="row_first">
<th>
<:tradlang:codelangue:>
</th>
<th>
<th class="module">
<:tradlang:th_module:>
</th>
<th>
<th class="id">
<:tradlang:codelangue:>
</th>
<th class="str_source">
<:tradlang:th_langue_origine:>
</th>
<th>
<th class="str_trad">
<:tradlang:th_traduction:>
</th>
<th width="50px">
<th class="lang">
<:tradlang:th_langue:>
</th>
<th width="50px">
<th class="status">
<:tradlang:th_status:>
</th>
<th width="50px">&nbsp;</th>
<th class="modifier">&nbsp;</th>
</tr>
</thead>
<tbody>
<BOUCLE_recherche_tradlang(TRADLANGS tradlang_modules){id_tradlang_module?}{module?}{statut IN #ENV{statut,#LISTE{OK,MODIF,RELIRE,NEW}}}{lang ?IN #ENV{lang_string,#ENV{langues_possibles}}}{recherche?}{tri #GET{par},#GET{defaut_tri}}{pagination #ENV{pagination,20}}>
<tr class="[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})] statut_[(#STATUT|strtolower)]" id="tradlang-#ID_TRADLANG">
<td>#ID</td>
<td>#NOM_MOD</td>
<td class="module">[(#NOM_MOD|joli_module)]</td>
<td class="id">#ID</td>
<BOUCLE_revise_orig(TRADLANGS){id=#ID}{lang=#LANG_MERE}{0,1}>
#SET{id_lang_mere,#ID_TRADLANG}
<td class="status[_(#STATUT|strtolower)] #EDIT{str_statut}">[(#STR**|entites_html|nl2br)]</td>
<td class="str_source status[_(#STATUT|strtolower)] #EDIT{str_statut}">[(#STR**|entites_html|nl2br)]</td>
</BOUCLE_revise_orig>
<td><:tradlang:str_existe_plus:></td>
<//B_revise_orig>
<td class="#EDIT{str_statut}">
[(#GET{id_lang_mere}|=={#ID_TRADLANG}|non)[(#STR**|entites_html|nl2br)]]
[(#GET{id_lang_mere}|=={#ID_TRADLANG}|oui)<em><:tradlang:info_chaine_originale:></em>]
</td>
<td class="lang" width="50px"><abbr title="[(#LANG|traduire_nom_langue)]"><a href="[(#URL_PAGE{tradlang_bilan}|parametre_url{langue_modules,#LANG})]">#LANG</a></abbr></td>
<td class="status" width="50px">[(#STATUT)]</td>
<td class="modifier" width="50px">
[(#GET{id_lang_mere}|=={#ID_TRADLANG}|non)<td class="str_trad #EDIT{str_statut}">[(#STR**|entites_html|nl2br)]</td>]
[(#GET{id_lang_mere}|=={#ID_TRADLANG}|oui)<td class="str_trad"><em><:tradlang:info_chaine_originale:></em></td>]
<td class="lang"><a class="badge badge-primary" href="[(#URL_PAGE{tradlang_bilan}|parametre_url{langue_modules,#LANG})]"><abbr title="[(#LANG|traduire_nom_langue)]">#LANG</abbr></a></td>
<td class="status">[<span class="badge badge-secondary">(#STATUT)</span>]</td>
<td class="modifier">
[(#GET{id_lang_mere}|=={#ID_TRADLANG}|non)
<a href="[(#URL_TRADLANG|parametre_url{id_tradlang,#ID_TRADLANG}|parametre_url{retour,#SELF})]"><:tradlang:lien_editer_chaine:></a>]
<a href="[(#URL_TRADLANG|parametre_url{id_tradlang,#ID_TRADLANG}|parametre_url{retour,#SELF})]" title="<:tradlang:lien_editer_chaine|attribut_html:>">#ICON{edit}</a>]
</td>
</tr>
</BOUCLE_recherche_tradlang>


+ 21
- 0
theme/css/_components.scss View File

@@ -35,6 +35,24 @@ img {
height:auto;
}

.crayon-html {
&:before {
box-shadow: 0 0 10px #888;
}
.editer_statut {
display: flex;
flex-wrap: wrap;
&>label {
flex-basis: 100%;
width: 100%;
}
.choix {
display: block;
flex-basis: 25%;
width: 25%;
}
}
}

.searchbar {
padding:0.25rem 0;
@@ -242,6 +260,9 @@ img {
padding: 0.25rem 0.5rem;
min-height: 2.5em;
}
fieldset>.editer-groupe {
margin-bottom: 0;
}
}
.formulaire_tradlang_choisir_module {
.editer-groupe {


+ 25
- 1
theme/css/_content.scss View File

@@ -26,7 +26,7 @@

#content {
.texte, .chapo {
max-width: 35em;
max-width: 40em;
}
margin-bottom: 2 * $rem-vert-margin;

@@ -34,6 +34,13 @@
.main + aside {
margin-top: 2 * $rem-vert-margin;
}
.liste.articles {
max-width: 45em;
}

.comment-meta .spip_logo {
max-width: 64px;
}
}


@@ -51,4 +58,21 @@
height: 100%;
margin-bottom: 0;
}
}

table.liste_traductions {
.lang,.status,.modifier {
width: 3rem;
}
.statut_new {
.str_trad {
color:theme-color-level('info', $alert-color-level);
}
}
.statut_modif {
.str_trad {
color:theme-color-level('warning', $alert-color-level);
}
}

}

+ 2
- 2
theme/css/_variables.scss View File

@@ -1045,12 +1045,12 @@ $figure-caption-color: $gray-600 !default;
// Breadcrumbs

$breadcrumb-padding-y: .75rem !default;
$breadcrumb-padding-x: 1rem !default;
$breadcrumb-padding-x: 0 !default;
$breadcrumb-item-padding: .5rem !default;

$breadcrumb-margin-bottom: 1rem !default;

$breadcrumb-bg: $gray-200 !default;
$breadcrumb-bg: transparent !default;
$breadcrumb-divider-color: $gray-600 !default;
$breadcrumb-active-color: $gray-600 !default;
$breadcrumb-divider: quote("/") !default;


+ 1
- 0
top/article.html View File

@@ -4,6 +4,7 @@
]

<BOUCLE_article(ARTICLES){id_article}>
<INCLURE{fond=breadcrumb/dist,id_article} />
<div class="cartouche">
<h1 class="#EDIT{titre} titre-article">[<span>(#TITRE)</span>]</h1>
</div>


+ 3
- 0
top/distributions.html View File

@@ -0,0 +1,3 @@
<div class="cartouche">
<h1 class="h1"><:tradlang:titre_distributions:></h1>
</div>

+ 15
- 0
top/grappe.html View File

@@ -0,0 +1,15 @@
<BOUCLE_top(GRAPPES){id_grappe}{tous}>
<!--
<p id="hierarchie"><a href="#URL_SITE_SPIP/"></a><span class="sep"> &gt; </span><a href="" class="spip_in"></a>[<span class="sep"> &gt; </span>]</p>
-->
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="#URL_SITE_SPIP"><:accueil_site:></a></li>
<li class="breadcrumb-item"><a href="#URL_PAGE{distributions}"><:tradlang:info_distributions:></a></li>
<li class="breadcrumb-item active" aria-current="page">[<strong class="on">(#TITRE|couper{80})</strong>]</li>
</ol>
<div class="cartouche">
[(#LOGO_GRAPPE|image_reduire{200,200})]
[(#FORMULAIRE_FAVORI{grappe,#ID_GRAPPE})]
<h1 class="h1">#TITRE</h1>
</div>
</BOUCLE_top>

+ 0
- 10
top/recherche.html View File

@@ -1,10 +0,0 @@
<div class="cartouche">
#SET{resultats, 0}
<BOUCLE_nb_resultats(PLUGINS){categorie?}{compatible_spip #ENV{compatible_spip,#EVAL{_PLUGINSPIP_BRANCHE_STABLE}}}{recherche?}{id_depot?}> </BOUCLE_nb_resultats>
#SET{resultats, #TOTAL_BOUCLE}
</B_nb_resultats>

<h1 class="titre-article"><:resultats_recherche:>
<small class="d-block">[&#171;&nbsp;(#RECHERCHE) &nbsp;&#187;][&nbsp;<:pluginspip:compat_spip:>&nbsp;(#ENV{compatible_spip,#EVAL{_PLUGINSPIP_BRANCHE_STABLE}})&nbsp;\(#GET{resultats}\)]</small>
</h1>
</div>

+ 5
- 0
top/rubrique.html View File

@@ -0,0 +1,5 @@
<BOUCLE_rubrique(RUBRIQUES){id_rubrique}>
<div class="cartouche">
<h1 class="#EDIT{titre}">[<span>(#TITRE)</span>]</h1>
</div>
</BOUCLE_rubrique>

+ 7
- 0
top/traduction_recherche.html View File

@@ -0,0 +1,7 @@
<div class="cartouche">
#SET{resultats, 0}
[(#PLUGIN{Fulltext}|oui)<span class="float-right"><a href="#URL_PAGE{aide_recherche}" class="btn btn-sm btn-secondary aide mediabox">#ICON{info} <:tradlang:lien_aide_recherche:></a></span>]
<h1 class="titre-article"><:resultats_recherche:>
<small class="d-block">[&#171;&nbsp;(#RECHERCHE) &nbsp;&#187;]</small>
</h1>
</div>

Loading…
Cancel
Save