From a9aa68014740ab7bd56e254b073bbfe64bb8a593 Mon Sep 17 00:00:00 2001 From: Eric Lupinacci Date: Sun, 12 Jan 2020 20:48:52 +0100 Subject: [PATCH] Mise au point du YAML du dashboard et ajout d'un dashboard de test en JSON --- ezcheck/dashboards/contrib.json | 28 ------------------- ezcheck/dashboards/contrib.yaml | 28 +++++++++---------- ezcheck/dashboards/contrib2.json | 23 +++++++++++++++ lang/contrib_fr.php | 12 ++++---- prive/squelettes/contenu/dashboard.html | 2 -- .../{navigation => extra}/dashboard.html | 6 +--- 6 files changed, 44 insertions(+), 55 deletions(-) delete mode 100644 ezcheck/dashboards/contrib.json create mode 100644 ezcheck/dashboards/contrib2.json delete mode 100644 prive/squelettes/contenu/dashboard.html rename prive/squelettes/{navigation => extra}/dashboard.html (73%) diff --git a/ezcheck/dashboards/contrib.json b/ezcheck/dashboards/contrib.json deleted file mode 100644 index c4a24cc..0000000 --- a/ezcheck/dashboards/contrib.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "nom": "<:contrib:dashboard_contrib_nom:>", - "description": "<:contrib:dashboard_contrib_desc:>", - "icone": "dashboard-24.png", - "boite": "<:contrib:boite_contrib_desc:>", - "groupes": [ - {"article": - { - "identifiant": "article", - "nom": "<:contrib:groupe_contrib_article_nom:>", - "controles": [ - "contrib_article_prepa", - "contrib_article_prop", - "contrib_article_refuse" - ] - } - }, - {"rubrique": - { - "identifiant": "rubrique", - "nom": "<:contrib:groupe_contrib_article_nom:>", - "controles": [ - "contrib_rubrique_prefixe" - ] - } - } - ] -} diff --git a/ezcheck/dashboards/contrib.yaml b/ezcheck/dashboards/contrib.yaml index e2df927..ba17a3f 100644 --- a/ezcheck/dashboards/contrib.yaml +++ b/ezcheck/dashboards/contrib.yaml @@ -1,17 +1,17 @@ -nom: "<:contrib:dashboard_contrib_nom:>" -description: "<:contrib:dashboard_contrib_desc:>" -icone: dashboard-24.png -boite: "<:contrib:boite_contrib_desc:>" +nom: '<:contrib:dashboard_contrib_nom:>' +description: '<:contrib:dashboard_contrib_desc:>' +icone: 'dashboard-24.png' +boite: '<:contrib:boite_contrib_desc:>' groupes: -- article: - identifiant: article - nom: "<:contrib:groupe_contrib_article_nom:>" + - + identifiant: 'article' + nom: '<:contrib:groupe_contrib_article_nom:>' controles: - - contrib_article_prepa - - contrib_article_prop - - contrib_article_refuse -- rubrique: - identifiant: rubrique - nom: "<:contrib:groupe_contrib_article_nom:>" + - 'contrib_article_prepa' + - 'contrib_article_prop' + - 'contrib_article_refuse' + - + identifiant: 'rubrique' + nom: '<:contrib:groupe_contrib_rubrique_nom:>' controles: - - contrib_rubrique_prefixe + - 'contrib_rubrique_prefixe' diff --git a/ezcheck/dashboards/contrib2.json b/ezcheck/dashboards/contrib2.json new file mode 100644 index 0000000..e6a1823 --- /dev/null +++ b/ezcheck/dashboards/contrib2.json @@ -0,0 +1,23 @@ +{ + "nom": "contrib essai 2", + "description": "", + "boite": "Dashboard essai pour en tester deux", + "groupes": [ + { + "identifiant": "article", + "nom": "<:contrib:groupe_contrib_article_nom:>", + "controles": [ + "contrib_article_prepa", + "contrib_article_prop", + "contrib_article_refuse" + ] + }, + { + "identifiant": "rubrique", + "nom": "<:contrib:groupe_contrib_article_nom:>", + "controles": [ + "contrib_rubrique_prefixe" + ] + } + ] +} \ No newline at end of file diff --git a/lang/contrib_fr.php b/lang/contrib_fr.php index c046499..e8ab58f 100644 --- a/lang/contrib_fr.php +++ b/lang/contrib_fr.php @@ -19,8 +19,12 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'configuration_secteur_galaxie_explication' => 'Choisir parmi les secteurs disponibles (hors secteur-carnet, secteur-apropos et secteurs-plugin) le ou les secteurs qui composeront la partie Galaxie du site.', // D - 'dashboard_page_titre' => 'Dashboard de SPIP-Contrib', - 'dashboard_menu' => 'Dashboard SPIP-Contrib', + 'dashboard_contrib_nom' => 'Dashboard de SPIP-Contrib', + 'dashboard_contrib_desc' => 'Le dashboard de SPIP-Contrib permet de contrôler la cohérence de la structure définie au fil du temps. Ce dashboard utilise les objets et les mécanismes du plugin Check Factory.', + + // D + 'groupe_contrib_article_nom' => 'Articles', + 'groupe_contrib_rubrique_nom' => 'Rubriques', // L 'icone_voir_plugin' => 'Voir le plugin', @@ -39,12 +43,8 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'rubrique_plugin_synchroniser_texte_label' => 'Synchroniser les rubriques-plugin', // T - 'type_controle_aucun_disponible' => 'Aucun type de contrôle disponible. Essayez de relancer le chargement.', - 'type_controle_activer' => 'Activer le type de contrôle', - 'type_controle_desactiver' => 'Désactiver le type de contrôle', 'type_controle_article_prepa_nom' => 'Articles en cours de rédaction', 'type_controle_article_prepa_desc' => 'Les articles sont classés par année, des plus anciens aux plus récents.', 'type_controle_rubrique_prefixe_nom' => 'Rubriques-plugin avec préfixe erroné', 'type_controle_rubrique_prefixe_desc' => 'Le préfixe est soit absent, soit inconnu de SVP.', - ); diff --git a/prive/squelettes/contenu/dashboard.html b/prive/squelettes/contenu/dashboard.html deleted file mode 100644 index 1cffb66..0000000 --- a/prive/squelettes/contenu/dashboard.html +++ /dev/null @@ -1,2 +0,0 @@ -[(#AUTORISER{webmestre}|sinon_interdire_acces)] -

<:contrib:dashboard_page_titre:>

diff --git a/prive/squelettes/navigation/dashboard.html b/prive/squelettes/extra/dashboard.html similarity index 73% rename from prive/squelettes/navigation/dashboard.html rename to prive/squelettes/extra/dashboard.html index 3e6bda9..877d172 100644 --- a/prive/squelettes/navigation/dashboard.html +++ b/prive/squelettes/extra/dashboard.html @@ -1,8 +1,4 @@ -[(#REM) ] -#BOITE_OUVRIR{#CHEMIN_IMAGE{boussole_gerer-24.png}|balise_img{'',cadre-icone}, info} - <:contrib:boite_info_explication:> -#BOITE_FERMER - +[(#REM) ] [(#AUTORISER{webmestre}|oui) #BOITE_OUVRIR{'', raccourcis} [(#URL_ACTION_AUTEUR{rubrique_categorie_synchroniser_texte, '', #SELF}