branch develop updated (ad502bb -> 1cf983b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from ad502bb import et export des participants d'un sondage restreint vers une liste de votants new 1cf983b validation des participants au vote + correction du noms de la liste principal d'un vote The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1cf983bdd39e597106065176a42d13b9b6af3e43 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon May 22 16:21:04 2017 +0200 validation des participants au vote + correction du noms de la liste principal d'un vote Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 2 ++ pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html | 4 +++- pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 1cf983bdd39e597106065176a42d13b9b6af3e43 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon May 22 16:21:04 2017 +0200 validation des participants au vote + correction du noms de la liste principal d'un vote --- pollen-ui-riot-js/src/main/web/i18n.json | 2 ++ pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html | 4 +++- pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 777ab40..a3a3894 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -406,6 +406,7 @@ "voterList_importFavoriteList": "Importer une liste de votants", "voterList_importFavoriteList_none": "Aucune liste de votants enregistrées", "voterList_delete": "Supprimer la liste", + "voterList_mainList": "Liste principale du sondage : ", "voterList_member_name": "Nom", "voterList_member_email": "Courriel", "voterList_member_weight": "Poids", @@ -807,6 +808,7 @@ "voterList_exportFavoriteList": "Export to new favorite list", "voterList_importFavoriteList": "Import favorite list", "voterList_importFavoriteList_none": "None favorite list saved", + "voterList_mainList": "Poll main list : ", "voterList_delete": "delete list", "voterList_member_name": "Name", "voterList_member_email": "Email", diff --git a/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html b/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html index de6823a..7cbb624 100644 --- a/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html @@ -18,6 +18,7 @@ require("../popup/Modal.tag.html"); ref="name" disabled={opts.form.model.isClosed} value={opts.voterList.name} + required placeholder={__.name}> </div> <div class="o-field o-field--icon-left field-weight"> @@ -28,6 +29,7 @@ require("../popup/Modal.tag.html"); ref="weight" disabled={opts.form.model.isClosed} value={opts.voterList.weight} + required placeholder={__.weight}> </div> </div> @@ -202,7 +204,7 @@ require("../popup/Modal.tag.html"); this.opts.voterList.name = this.refs.name.value; this.opts.voterList.weight = this.refs.weight.value; } else { - this.opts.voterList.name = "main voters list"; + this.opts.voterList.name = this.__.mainList + this.opts.form.model.title; this.opts.voterList.weight = 1; } if (Array.isArray(this.refs.voterLists)) { diff --git a/pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html b/pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html index bc76cd1..c44b57b 100644 --- a/pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html @@ -11,6 +11,7 @@ ref="name" disabled={opts.form.model.isClosed} value={opts.member.name} + required placeholder={__.name}> </div> <div class="o-field"> @@ -20,6 +21,7 @@ ref="email" disabled={opts.form.model.isClosed} value={opts.member.email} + required placeholder={__.email}> </div> <div class="o-field o-field--icon-left field-weight"> @@ -30,6 +32,7 @@ ref="weight" disabled={opts.form.model.isClosed} value={opts.member.weight} + required placeholder={__.weight}> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm