From 60d089b4c76e4e6e1d2573d747fe8c81d27f28aa Mon Sep 17 00:00:00 2001 From: Pierre Boutet Date: Mon, 27 Feb 2017 15:50:37 +0100 Subject: [PATCH] update version for tags --- .gitignore | 2 +- build-package.xml | 27 ++++++++++- composer.local.json | 47 ++++++++++++------- maintenance/wikifabPages/en/Form_Tutorial.txt | 6 +-- .../wikifabPages/en/Template_Materials.txt | 4 +- .../wikifabPages/en/Template_Tuto_Details.txt | 2 +- .../wikifabPages/en/Template_Tuto_Step.txt | 2 +- maintenance/wikifabPages/fr/Form_Tutoriel.txt | 10 ++-- .../wikifabPages/fr/Template_Tuto_Details.txt | 2 +- 9 files changed, 72 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 1d3be04..00f6571 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ .project .settings *~ - +build diff --git a/build-package.xml b/build-package.xml index 38a6c86..c071ca0 100644 --- a/build-package.xml +++ b/build-package.xml @@ -69,7 +69,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,6 +113,7 @@ + diff --git a/composer.local.json b/composer.local.json index defdcaa..0688c19 100644 --- a/composer.local.json +++ b/composer.local.json @@ -8,6 +8,10 @@ "type": "vcs", "url": "git@github.com:Wikifab/skin-chameleon-wikifab.git" }, + { + "type": "vcs", + "url": "git@github.com:Wikifab/Echo.git" + }, { "type": "vcs", "url": "git@github.com:Wikifab/extension-UserFollowList.git" @@ -42,19 +46,19 @@ }, { "type": "vcs", - "url": "git@github.com:Wikifab/UsersWatchlist.git" + "url": "git@github.com:Wikifab/googleAnalytics.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/mediawiki-extensions-wfSocialProfil.git" + "url": "git@github.com:Wikifab/GroupsPage.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/mediawiki-extensions-SemanticForms.git" + "url": "git@github.com:Wikifab/mediawiki-extensions-CategoryTree.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/PageForms.git" + "url": "git@github.com:Wikifab/mediawiki-extensions-MultimediaViewer.git" }, { "type": "vcs", @@ -62,46 +66,54 @@ }, { "type": "vcs", - "url": "git@github.com:wikimedia/mediawiki-extensions-UserFunctions.git" + "url": "git@github.com:Wikifab/mediawiki-extensions-SemanticForms.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/googleAnalytics.git" + "url": "git@github.com:Wikifab/mediawiki-extensions-VisualEditor.git" }, { "type": "vcs", - "url": "git@github.com:wikimedia/mediawiki-extensions-Flow.git" + "url": "git@github.com:Wikifab/mediawiki-extension-VEForPageForm.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/UsersWatchButton.git" + "url": "git@github.com:Wikifab/mediawiki-extensions-wfSocialProfil.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/Echo.git" + "url": "git@github.com:Wikifab/PageForms.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/UsersPagesLinks.git" + "url": "git@github.com:Wikifab/PageMediaGallery.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/GroupsPage.git" + "url": "git@github.com:wikimedia/mediawiki-extensions-Flow.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/mediawiki-extensions-MultimediaViewer.git" + "url": "git@github.com:wikimedia/mediawiki-extensions-UserFunctions.git" }, { "type": "vcs", - "url": "git@github.com:Wikifab/PageMediaGallery.git" + "url": "git@github.com:Wikifab/UsersPagesLinks.git" + }, + { + "type": "vcs", + "url": "git@github.com:Wikifab/UsersWatchlist.git" + }, + { + "type": "vcs", + "url": "git@github.com:Wikifab/UsersWatchButton.git" } ], "minimum-stability": "dev", "prefer-stable": true, "require": { - "mediawiki/semantic-media-wiki": "^2.4.1", - "wikifab/wikifabStyleModule": "^0.2.0", + "mediawiki/CategoryTree": "*", + "wikifab/wikifabStyleModule": "^0.2.4", "wikifab/SocialProfile": "^0.1.0", "wikifab/page-forms": "^0.1.0", "wikifab/chameleon-skin": "^0.2.0", @@ -121,8 +133,9 @@ "wikifab/Echo":"^0.1.0", "wikifab/UsersPagesLinks":"^0.1.0", "wikifab/GroupsPage":"^0.1.0", - "wikifab/MultimediaViewer":"^0.1.0", - "wikifab/PageMediaGallery":"^0.2.0" + "wikifab/MultimediaViewer":"^0.2.0", + "wikifab/PageMediaGallery":"^0.2.0", + "wikifab/VEForPageForm":"^0.1.0" }, "suggest": { "ext-imagick": "*", diff --git a/maintenance/wikifabPages/en/Form_Tutorial.txt b/maintenance/wikifabPages/en/Form_Tutorial.txt index b0f8016..b5cb9b4 100644 --- a/maintenance/wikifabPages/en/Form_Tutorial.txt +++ b/maintenance/wikifabPages/en/Form_Tutorial.txt @@ -87,12 +87,12 @@ __NOTOC__ Tools & Materials=
Materials
-{{{field|Material|input type=textarea|rows=8|placeholder=List the materials required to make your creation/product/object. +{{{field|Material|input type=textarea|rows=8|class=form-textarea|placeholder=List the materials required to make your creation/product/object. If it's appropriate, use bullet points. To create a bullet point, enter the star symbol (*) at the beginning of your sentence. Never mention commercial brands unless the object of your tutorial can't be made without a product of that brand.}}}
Tools
-{{{field|Tools|input type=textarea|rows=8|placeholder=List the tools required to make your creation/product/object. +{{{field|Tools|input type=textarea|rows=8|class=form-textarea|placeholder=List the tools required to make your creation/product/object. If it's appropriate, use bullet points. To create a bullet point, enter the star symbol (*) at the beginning of your sentence. Never mention commercial brands unless the object of your tutorial can't be made without a product of that brand.}}}
@@ -174,7 +174,7 @@ Never mention commercial brands unless the object of your tutorial can't be made

Notes and references

{{{for template|Notes}}} -{{{field|Notes|input type=textarea|rows=5|maxlength=5000|placeholder=List the notes and references for this tutorial.}}}

Learn how to insert references.

+{{{field|Notes|input type=textarea|rows=5|class=form-textarea|maxlength=5000|placeholder=List the notes and references for this tutorial.}}}

Learn how to insert references.

{{{end template}}}
diff --git a/maintenance/wikifabPages/en/Template_Materials.txt b/maintenance/wikifabPages/en/Template_Materials.txt index 0b6d393..c7c8738 100644 --- a/maintenance/wikifabPages/en/Template_Materials.txt +++ b/maintenance/wikifabPages/en/Template_Materials.txt @@ -3,7 +3,7 @@ Tools & Materials= {{#if:{{{Step_Picture_00|}}}| - {{MaterialsImage|[[Material::{{{Material|}}}]]|[[Tools::{{{Tools|}}}]]|{{ #carousel: [[File:{{{Step_Picture_00}}}]] | [[File:{{{Step_Picture_01}}}]] | [[File:{{{Step_Picture_02}}}]] | [[File:{{{Step_Picture_03}}}]] | [[File:{{{Step_Picture_04}}}]] | [[File:{{{Step_Picture_05}}}]] }} }} | + {{MaterialsImage|[[Material::{{{Material|}}}]]|[[Tools::{{{Tools|}}}]]|{{ #carousel: [[File:{{{Step_Picture_00}}}|frameless]] | [[File:{{{Step_Picture_01}}}|frameless]] | [[File:{{{Step_Picture_02}}}|frameless]] | [[File:{{{Step_Picture_03}}}|frameless]] | [[File:{{{Step_Picture_04}}}|frameless]] | [[File:{{{Step_Picture_05}}}|frameless]] }} }} | {{MaterialsNoImage|[[Material::{{{Material|}}}]]|[[Tools::{{{Tools|}}}]] }} }} |-| @@ -16,7 +16,7 @@ Tools & Materials= {{#if:{{{Step_Picture_00|}}}| - {{MaterialsImage|[[Material::{{{Material|}}}]]|[[Tools::{{{Tools|}}}]]|{{ #carousel: [[File:{{{Step_Picture_00}}}]] | [[File:{{{Step_Picture_01}}}]] | [[File:{{{Step_Picture_02}}}]] | [[File:{{{Step_Picture_03}}}]] | [[File:{{{Step_Picture_04}}}]] | [[File:{{{Step_Picture_05}}}]] }} }} | + {{MaterialsImage|[[Material::{{{Material|}}}]]|[[Tools::{{{Tools|}}}]]|{{ #carousel: [[File:{{{Step_Picture_00}}}|frameless]] | [[File:{{{Step_Picture_01}}}|frameless]] | [[File:{{{Step_Picture_02}}}|frameless]] | [[File:{{{Step_Picture_03}}}|frameless]] | [[File:{{{Step_Picture_04}}}|frameless]] | [[File:{{{Step_Picture_05}}}|frameless]] }} }} | {{MaterialsNoImage|[[Material::{{{Material|}}}]]|[[Tools::{{{Tools|}}}]] }} }} diff --git a/maintenance/wikifabPages/en/Template_Tuto_Details.txt b/maintenance/wikifabPages/en/Template_Tuto_Details.txt index 5bb0ef5..8692df2 100644 --- a/maintenance/wikifabPages/en/Template_Tuto_Details.txt +++ b/maintenance/wikifabPages/en/Template_Tuto_Details.txt @@ -15,7 +15,7 @@ A [[Type::{{{Type|}}}]] by {{#displayAuthorD
-[[File:{{{Main_Picture}}}|border]] +[[File:{{{Main_Picture}}}|frameless|border]]
diff --git a/maintenance/wikifabPages/en/Template_Tuto_Step.txt b/maintenance/wikifabPages/en/Template_Tuto_Step.txt index bd51311..1a106a4 100644 --- a/maintenance/wikifabPages/en/Template_Tuto_Step.txt +++ b/maintenance/wikifabPages/en/Template_Tuto_Step.txt @@ -1,5 +1,5 @@ {{#if:{{{Step_Picture_00|}}}| - {{Tuto StepImage|[[Step_Title::{{{Step_Title|}}}]]|[[Step_Content::{{{Step_Content|}}}]]|{{ #carousel: [[File:{{{Step_Picture_00}}}]] | [[File:{{{Step_Picture_01}}}]] | [[File:{{{Step_Picture_02}}}]] | [[File:{{{Step_Picture_03}}}]] | [[File:{{{Step_Picture_04}}}]] | [[File:{{{Step_Picture_05}}}]] }} }} | + {{Tuto StepImage|[[Step_Title::{{{Step_Title|}}}]]|[[Step_Content::{{{Step_Content|}}}]]|{{ #carousel: [[File:{{{Step_Picture_00}}}|frameless]] | [[File:{{{Step_Picture_01}}}|frameless]] | [[File:{{{Step_Picture_02}}}|frameless]] | [[File:{{{Step_Picture_03}}}|frameless]] | [[File:{{{Step_Picture_04}}}|frameless]] | [[File:{{{Step_Picture_05}}}|frameless]] }} }} | {{Tuto StepNoImage|[[Step_Title::{{{Step_Title|}}}]]|[[Step_Content::{{{Step_Content|}}}]]}} }} [[Category:Tutorials]] diff --git a/maintenance/wikifabPages/fr/Form_Tutoriel.txt b/maintenance/wikifabPages/fr/Form_Tutoriel.txt index 9349828..f225688 100644 --- a/maintenance/wikifabPages/fr/Form_Tutoriel.txt +++ b/maintenance/wikifabPages/fr/Form_Tutoriel.txt @@ -53,6 +53,10 @@ __NOTOC__
{{{field|Area|mandatory|class=form-checkbox}}}
+
Mot(s)-clé(s)
+
{{{field|Tags|class=form-tokens|input type=tokens|size=}}} {{#info:Entrez 4 à 5 mots clés pour décrire votre tutoriel (séparez chaque mot clé par une virgule).}}
+
+
Description
{{{field|Description|input type=textarea|mandatory|rows=3|maxlength=4000|class=form-textarea|placeholder=Décrivez l'objet du tutoriel en quelques lignes}}}
@@ -86,12 +90,12 @@ __NOTOC__ Outils & Matériaux=
Liste des matériaux
-{{{field|Material|input type=textarea|rows=8|placeholder=Listez les matériaux nécessaires à la réalisation de votre tutoriel. +{{{field|Material|input type=textarea|rows=8|class=form-textarea|placeholder=Listez les matériaux nécessaires à la réalisation de votre tutoriel. Privilégiez les puces (bullet points). Pour activer une puce, entrez le symbole étoile (*) au début de chaque ligne. L'utilisation de noms commerciaux (marques) n'est autorisé que si la réalisation de votre tutoriel n'est possible qu'avec le produit de la marque en question.}}}
Liste des outils
-{{{field|Tools|input type=textarea|rows=8|placeholder=Listez les outils nécessaires à la réalisation de votre tutoriel. +{{{field|Tools|input type=textarea|rows=8|class=form-textarea|placeholder=Listez les outils nécessaires à la réalisation de votre tutoriel. Privilégiez les puces (bullet points). Pour activer une puce, entrez le symbole étoile (*) au début de chaque ligne. Utilisez le nom générique de l'outil et ne citez pas de noms commerciaux (marques).}}}
@@ -173,7 +177,7 @@ L'utilisation de nom commerciaux (marques, etc.) est interdite.}}}

Notes et références

{{{for template|Notes}}} -{{{field|Notes|input type=textarea|rows=5|maxlength=5000|placeholder=Entrez ici les notes et références du tutoriel.}}}

Apprendre à insérer des références.

+{{{field|Notes|input type=textarea|rows=5|class=form-textarea|maxlength=5000|placeholder=Entrez ici les notes et références du tutoriel.}}}

Apprendre à insérer des références.

{{{end template}}}
diff --git a/maintenance/wikifabPages/fr/Template_Tuto_Details.txt b/maintenance/wikifabPages/fr/Template_Tuto_Details.txt index e9f4bff..6e7b69a 100644 --- a/maintenance/wikifabPages/fr/Template_Tuto_Details.txt +++ b/maintenance/wikifabPages/fr/Template_Tuto_Details.txt @@ -15,7 +15,7 @@ Une [[Type::{{{Type|}}}]] de{{#displayAuthor
-[[Fichier:{{{Main_Picture}}}|border]] +[[Fichier:{{{Main_Picture}}}|frameless|border]]