From d7675831e15d7bd9ef18dda14218450b75e511c5 Mon Sep 17 00:00:00 2001 From: Olivier Perez Date: Fri, 29 Jul 2016 13:43:59 +0200 Subject: [PATCH 1/5] New style of poll id --- locale/en.json | 2 +- locale/fr.json | 6 +++--- tpl/create_poll.tpl | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/locale/en.json b/locale/en.json index cc49b95..44c8e7f 100644 --- a/locale/en.json +++ b/locale/en.json @@ -229,7 +229,7 @@ "You are in the poll creation section.": "You are in the poll creation section.", "Required fields cannot be left blank.": "Required fields cannot be left blank.", "Poll title": "Poll title", - "Poll id": "Identifier", + "Poll id": "Poll link", "Poll id rules": "The identifier can contain letters, numbers and dashes \"-\".", "Poll id warning": "By defining an identifier that can facilitate access to the poll for unwanted people. It is recommended to protect it with a password.", "Votes cannot be modified": "Votes cannot be modified", diff --git a/locale/fr.json b/locale/fr.json index e80c610..241267b 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -229,9 +229,9 @@ "You are in the poll creation section.": "Vous avez choisi de créer un nouveau sondage.", "Required fields cannot be left blank.": "Merci de remplir les champs obligatoires, marqués d'une *.", "Poll title": "Titre du sondage", - "Poll id": "Identifiant", - "Poll id rules": "L'identifiant peut contenir des lettres, des chiffres et des tirets \"-\".", - "Poll id warning": "En définissant un identifiant cela peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", + "Poll id": "Lien du sondage", + "Poll id rules": "(peut contenir des lettres, des chiffres et des tirets)", + "Poll id warning": "La modification du lien du sondage peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", "Votes cannot be modified": "Aucun vote ne peut être modifié", "All voters can modify any vote": "Tous les sondés peuvent modifier tous les votes", "Voters can modify their vote themselves": "Chaque sondé peut modifier son propre vote", diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl index 780431e..e7438a3 100644 --- a/tpl/create_poll.tpl +++ b/tpl/create_poll.tpl @@ -34,18 +34,23 @@ {/if}
- +
+ + {$SERVER_URL} +
- {__('Step 1', 'Poll id rules')} {__('Step 1', 'Poll id warning')}
From 8066e18ae762b265fe3bd7b2c0dd6a0521f7eaee Mon Sep 17 00:00:00 2001 From: Olivier Perez Date: Fri, 29 Jul 2016 16:22:12 +0200 Subject: [PATCH 2/5] Reorder parameters at poll creation --- tpl/create_poll.tpl | 221 ++++++++++++++++++++++---------------------- 1 file changed, 108 insertions(+), 113 deletions(-) diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl index e7438a3..fd3dbde 100644 --- a/tpl/create_poll.tpl +++ b/tpl/create_poll.tpl @@ -17,68 +17,6 @@

-
- - -
- -
-
- {if !empty($errors['title']['msg'])} -
-

- {$errors['title']['msg']} -

-
- {/if} - -
- - -
-
- - - - - {$SERVER_URL} - - -
- {__('Step 1', 'Poll id warning')} -
-
- {if !empty($errors['id']['msg'])} -
-

- {$errors['id']['msg']} -

-
- {/if} - -
- - -
- -
-
- {if !empty($errors['description']['msg'])} -
-

- {$errors['description']['msg']} -

-
- {/if} -
@@ -123,6 +61,113 @@ {/if} +
+ + +
+ +
+
+ {if !empty($errors['title']['msg'])} +
+

+ {$errors['title']['msg']} +

+
+ {/if} + +
+ + +
+ +
+
+ {if !empty($errors['description']['msg'])} +
+

+ {$errors['description']['msg']} +

+
+ {/if} + +
+ + +
+
+ + + + + {$SERVER_URL} + + +
+ {__('Step 1', 'Poll id warning')} +
+
+ {if !empty($errors['id']['msg'])} +
+

+ {$errors['id']['msg']} +

+
+ {/if} + +
+
+
+ +
+
+ +
+
@@ -185,56 +230,6 @@
-
-
-
- -
-
- -
- - - - - -

-{/block} \ No newline at end of file +{/block} From 7b5f42b1749a7cc70283dd7415a9ced3affb7401 Mon Sep 17 00:00:00 2001 From: Olivier Perez Date: Fri, 29 Jul 2016 14:08:41 +0200 Subject: [PATCH 3/5] New style for password fields --- locale/de.json | 3 ++- locale/en.json | 3 ++- locale/es.json | 3 ++- locale/fr.json | 9 +++++---- locale/it.json | 3 ++- locale/oc.json | 3 ++- tpl/create_poll.tpl | 23 ++++++++++++++++------- 7 files changed, 31 insertions(+), 16 deletions(-) diff --git a/locale/de.json b/locale/de.json index 9034792..19d1364 100644 --- a/locale/de.json +++ b/locale/de.json @@ -241,7 +241,8 @@ "Use a password to restrict access": "Verwende ein Passwort um den Zugriff zu beschänken", "The results are publicly visible": "Die Ergebnisse sind öffentlich Einsehbar", "Poll password": "Password", - "Confirm password": "Passwort bestätigen", + "Password choice": "DE_Choix", + "Password confirmation": "DE_Confirmation", "Go to step 2": "Weiter zum 2. Schritt" }, "Step 2": { diff --git a/locale/en.json b/locale/en.json index 44c8e7f..611a301 100644 --- a/locale/en.json +++ b/locale/en.json @@ -241,7 +241,8 @@ "Use a password to restrict access": "Use a password to restrict access", "The results are publicly visible": "The results are publicly visible", "Poll password": "Password", - "Confirm password": "Confirmer votre mot de passe", + "Password choice": "Choice", + "Password confirmation": "Confirmation", "Go to step 2": "Go to step 2" }, "Step 2": { diff --git a/locale/es.json b/locale/es.json index 7d1a56e..73e032c 100644 --- a/locale/es.json +++ b/locale/es.json @@ -241,7 +241,8 @@ "Use a password to restrict access": "ES_Utiliser un mot de passe pour restreindre l'accès au sondage", "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", + "Password choice": "ES_Choix", + "Password confirmation": "ES_Confirmation", "Go to step 2": "Ir al paso número 2" }, "Step 2": { diff --git a/locale/fr.json b/locale/fr.json index 241267b..6828471 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -235,13 +235,14 @@ "Votes cannot be modified": "Aucun vote ne peut être modifié", "All voters can modify any vote": "Tous les sondés peuvent modifier tous les votes", "Voters can modify their vote themselves": "Chaque sondé peut modifier son propre vote", - "To receive an email for each new vote": "Recevoir un courriel à chaque participation d'un sondé", + "To receive an email for each new vote": "Recevoir un courriel à chaque participation", "To receive an email for each new comment": "Recevoir un courriel à chaque commentaire", "Only the poll maker can see the poll's results": "Seul le créateur du sondage peut voir les résultats", - "Use a password to restrict access": "Utiliser un mot de passe pour restreindre l'accès au sondage", + "Use a password to restrict access": "Restreindre l'accès au sondage par mot de passe", "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 ", + "Password choice": "Choix", + "Password confirmation": "Confirmation", "Go to step 2": "Aller à l'étape 2" }, "Step 2": { @@ -419,4 +420,4 @@ "Check again": "Vérifier à nouveau", "Continue the installation": "Continuer l'installation" } -} \ No newline at end of file +} diff --git a/locale/it.json b/locale/it.json index 5a0cabb..6c61d57 100644 --- a/locale/it.json +++ b/locale/it.json @@ -241,7 +241,8 @@ "Use a password to restrict access": "Utilizzare una passwor per limitare l'accesso al sondaggio", "The results are publicly visible": "I risultati sono visibili senza password", "Poll password": "Password", - "Confirm password": "Conferma della password", + "Password choice": "IT_Choix", + "Password confirmation": "Conferma della password", "Go to step 2": "Andare al punto 2" }, "Step 2": { diff --git a/locale/oc.json b/locale/oc.json index b8f5688..45aad66 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -241,7 +241,8 @@ "Use a password to restrict access": "OC_Utiliser un mot de passe pour restreindre l'accès au sondage", "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 ", + "Password choice": "OC_Choix", + "Password confirmation": "OC_Confirmation", "Go to step 2": "Anar a l'etapa 2" }, "Step 2": { diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl index fd3dbde..3d8e434 100644 --- a/tpl/create_poll.tpl +++ b/tpl/create_poll.tpl @@ -124,7 +124,11 @@ {/if}
-
+ + +
+