Factorized description button and added modal hint.

locale/de.json

@@ -38,6 +38,7 @@
         "Search": "Suche",
         "Creation date:": "Erstellungsdatum:",
         "Caption": "Bildunterschrift",
+        "Markdown": "Markdown",
         "ASTERISK": "*"
     },
     "Date": {
@@ -241,7 +242,10 @@
         "The results are publicly visible": "DE_Les résultats sont visibles sans mot de passe",
         "Poll password": "DE_Mot de passe",
         "Confirm password": "DE_Confirmer votre mot de passe",
-        "Go to step 2": "Weiter zum 2. Schritt"
+        "Go to step 2": "Weiter zum 2. Schritt",
+        "To make the description more attractive, you can use the Markdown format.": "DE_Afin de rendre le descriptif de ce sondage plus attractif, vous pouvez utiliser le formatage Markdown.",
+        "You can enable or disable the editor at will.": "DE_Vous pouvez activer ou désactiver l'éditeur à votre guise.",
+        "More informations here:": "DE_Plus d'informations ici :"
     },
     "Step 2": {
         "Back to step 1": "Zurück zum 1. Schritt",

locale/en.json

@@ -38,6 +38,7 @@
     "Search": "Search",
     "Creation date:": "Creation date:",
     "Caption": "Caption",
+    "Markdown": "Markdown",
     "ASTERISK": "*"
   },
   "Date" : {
@@ -241,7 +242,10 @@
     "The results are publicly visible": "The results are publicly visible",
     "Poll password": "Password",
     "Confirm password": "Confirmer votre mot de passe",
-    "Go to step 2": "Go to step 2"
+    "Go to step 2": "Go to step 2",
+    "To make the description more attractive, you can use the Markdown format.": "To make the description more attractive, you can use the Markdown format.",
+    "You can enable or disable the editor at will.": "You can enable or disable the editor at will.",
+    "More informations here:": "More informations here:"
   },
   "Step 2": {
     "Back to step 1": "Return to step 1",

locale/es.json

@@ -38,6 +38,7 @@
     "Search": "Búsqueda",
     "Creation date:": "Fecha de creación:",
     "Caption": "Leyenda",
+    "Markdown": "Markdown",
     "ASTERISK": "*"
   },
   "Date": {
@@ -241,7 +242,10 @@
     "The results are publicly visible": "ES_Les résultats sont visibles sans mot de passe",
     "Poll password": "ES_Mot de passe",
     "Confirm password": "ES_Confirmer votre mot de passe",
-    "Go to step 2": "Ir al paso número 2"
+    "Go to step 2": "Ir al paso número 2",
+    "To make the description more attractive, you can use the Markdown format.": "ES_Afin de rendre le descriptif de ce sondage plus attractif, vous pouvez utiliser le formatage Markdown.",
+    "You can enable or disable the editor at will.": "ES_Vous pouvez activer ou désactiver l'éditeur à votre guise.",
+    "More informations here:": "ES_Plus d'informations ici :"
   },
   "Step 2": {
     "Back to step 1": "Volver al paso número 1",

locale/fr.json

@@ -38,6 +38,7 @@
     "Search": "Chercher",
     "Creation date:": "Date de création :",
     "Caption": "Légende",
+    "Markdown": "Markdown",
     "ASTERISK": "*"
   },
   "Date": {
@@ -241,7 +242,10 @@
     "The results are publicly visible": "Les résultats sont visibles sans mot de passe",
     "Poll password": "Mot de passe",
     "Confirm password": "Confirmer votre mot de passe   ",
-    "Go to step 2": "Aller à l'étape 2"
+    "Go to step 2": "Aller à l'étape 2",
+    "To make the description more attractive, you can use the Markdown format.": "Afin de rendre le descriptif de ce sondage plus attractif, vous pouvez utiliser le formatage Markdown.",
+    "You can enable or disable the editor at will.": "Vous pouvez activer ou désactiver l'éditeur à votre guise.",
+    "More informations here:": "Plus d'informations ici :"
   },
   "Step 2": {
     "Back to step 1": "Revenir à l’étape 1",

locale/it.json

@@ -38,6 +38,7 @@
     "Search": "Cercare",
     "Creation date:": "Data di creazione:",
     "Caption": "Titolo",
+    "Markdown": "Markdown",
     "ASTERISK": "*"
   },
   "Date": {
@@ -241,7 +242,10 @@
     "The results are publicly visible": "I risultati sono visibili senza password",
     "Poll password": "Password",
     "Confirm password": "Conferma della password",
-    "Go to step 2": "Andare al punto 2"
+    "Go to step 2": "Andare al punto 2",
+    "To make the description more attractive, you can use the Markdown format.": "IT_Afin de rendre le descriptif de ce sondage plus attractif, vous pouvez utiliser le formatage Markdown.",
+    "You can enable or disable the editor at will.": "IT_Vous pouvez activer ou désactiver l'éditeur à votre guise.",
+    "More informations here:": "IT_Plus d'informations ici :"
   },
   "Step 2": {
     "Back to step 1": "Torna al punto 1",

locale/oc.json

@@ -38,6 +38,7 @@
     "Search": "Cercar",
     "Creation date:": "Data de creacion :",
     "Caption": "OC_Légende",
+    "Markdown": "Markdown",
     "ASTERISK": "*"
   },
   "Date": {
@@ -241,7 +242,10 @@
     "The results are publicly visible": "OC_Les résultats sont visibles sans mot de passe",
     "Poll password": "OC_Mot de passe",
     "Confirm password": "OC_Confirmer votre mot de passe   ",
-    "Go to step 2": "Anar a l'etapa 2"
+    "Go to step 2": "Anar a l'etapa 2",
+    "To make the description more attractive, you can use the Markdown format.": "OC_Afin de rendre le descriptif de ce sondage plus attractif, vous pouvez utiliser le formatage Markdown.",
+    "You can enable or disable the editor at will.": "OC_Vous pouvez activer ou désactiver l'éditeur à votre guise.",
+    "More informations here:": "OC_Plus d'informations ici :"
   },
   "Step 2": {
     "Back to step 1": "Tornar a l'etapa 1",

tpl/create_poll.tpl

@@ -65,10 +65,7 @@
                     <label for="poll_comments" class="col-sm-4 control-label">{__('Generic', 'Description')}</label>
 
                     <div class="col-sm-8">
-                        <div class="btn-group" role="group" aria-label="...">
+                        {include 'part/description_markdown.tpl'}
-                            <button type="button" id="rich-editor-button" class="btn btn-default btn-xs active">Editeur riche</button>
-                            <button type="button" id="simple-editor-button" class="btn btn-default btn-xs">Editeur simple</button>
-                        </div>
                         <div>
                             <textarea id="poll_comments" name="description"
                                       class="form-control" {$errors['description']['aria']}

tpl/part/description_markdown.tpl

@@ -0,0 +1,34 @@
+{* Description buttons for markdown *}
+
+<div class="btn-group" role="group" aria-label="...">
+    <button type="button" id="rich-editor-button" class="btn btn-default btn-xs active">Editeur riche</button>
+    <button type="button" id="simple-editor-button" class="btn btn-default btn-xs">Editeur simple</button>
+</div>
+
+<a href="" data-toggle="modal" data-target="#markdown_modal"><i class="glyphicon glyphicon-info-sign"></i></a><!-- TODO Add accessibility -->
+
+<div id="markdown_modal" class="modal fade">
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">{__('Generic', 'Markdown')}</h4>
+            </div>
+            <div class="modal-body">
+                    <p>
+                        {__('Step 1', 'To make the description more attractive, you can use the Markdown format.')}
+                     </p>
+                    <p>
+
+                        {__('Step 1', 'You can enable or disable the editor at will.')}
+                    </p>
+                    <p>
+                        {__('Step 1', 'More informations here:')}
+                        <a href="http://{$locale}.wikipedia.org/wiki/Markdown">http://{$locale}.wikipedia.org/wiki/Markdown</a>
+                    </p>
+            </div>
+        </div>
+    </div>
+</div>

tpl/part/poll_info.tpl

@@ -79,10 +79,7 @@
                     {if $admin && !$expired}
                         <div class="hidden js-desc">
                             <label class="sr-only" for="newdescription">{__('Generic', 'Description')}</label>
-                            <div class="btn-group" role="group" aria-label="...">
+                            {include 'part/description_markdown.tpl'}
-                                <button type="button" id="rich-editor-button" class="btn btn-default btn-xs active">Editeur riche</button>
-                                <button type="button" id="simple-editor-button" class="btn btn-default btn-xs">Editeur simple</button>
-                            </div>
                             <textarea class="form-control" id="newdescription" name="description" rows="2" cols="40">{$poll->description|html}</textarea>
                             <button type="submit" id="btn-new-desc" name="update_poll_info" value="description" class="btn btn-sm btn-success" title="{__('PollInfo', 'Save the description')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
                             <button class="btn btn-default btn-sm btn-cancel" title="{__('PollInfo', 'Cancel the description edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>