branch develop updated (2425500 -> e3f1aac)
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 2425500 initialiser un nouveaux choix avec les valeurs du dernier new e3f1aac corrections orthographique + afficher l'utilisateur connecté 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 e3f1aac678fd4e2fbe1c57df1d88ece9a6cd11b9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 21 16:04:03 2017 +0100 corrections orthographique + afficher l'utilisateur connecté Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 20 ++++++++++---------- .../src/main/web/tag/PollenHeader.tag.html | 4 +++- 2 files changed, 13 insertions(+), 11 deletions(-) -- 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 e3f1aac678fd4e2fbe1c57df1d88ece9a6cd11b9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 21 16:04:03 2017 +0100 corrections orthographique + afficher l'utilisateur connecté --- pollen-ui-riot-js/src/main/web/i18n.json | 20 ++++++++++---------- .../src/main/web/tag/PollenHeader.tag.html | 4 +++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 52f70af..c30d817 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -28,7 +28,7 @@ "poll_voteStart": "Les votes ont commencé, certaines options ne sont pas modifiables.", "poll_votes_title": "Votes", "poll_votes_deleteVote": "Supprimer le vote ?", - "poll_votes_authorPlaceHolder": "Renseigner votre nom", + "poll_votes_authorPlaceHolder": "Renseignez votre nom", "poll_votes_vote": "Voter", "poll_votes_addChoice": "Ajouter un choix", "poll_votes_delete": "Supprimer le vote ?", @@ -115,7 +115,7 @@ "header_signout": "Déconnexion", "header_home": "Accueil", "header_i18n_lang": "Langue", - "header_myProfile": "Mon profile", + "header_myProfile": "Mon profil", "header_myPolls": "Mes sondages", "header_myInvitedPolls": "Mes invitations", "header_myParticipatedPolls": "Mes participations", @@ -129,13 +129,13 @@ "poll_cancel": "Annuler", "poll_description_next": "Suivant", "poll_description_title": "Titre", - "poll_description_titlePlaceHolder": "Renseigner le titre du sondage", + "poll_description_titlePlaceHolder": "Renseignez le titre du sondage", "poll_description_description": "Description", - "poll_description_descriptionPlaceHolder": "Renseigner la description du sondage", + "poll_description_descriptionPlaceHolder": "Renseignez la description du sondage", "poll_description_name": "Votre nom", - "poll_description_namePlaceHolder": "Renseigner votre nom", + "poll_description_namePlaceHolder": "Renseignez votre nom", "poll_description_email": "Votre courriel", - "poll_description_emailPlaceHolder": "Renseigner votre courriel", + "poll_description_emailPlaceHolder": "Renseignez votre courriel", "poll_settings_basic_usage": "Valeurs par défaut", "poll_settings_use_basic_usage": "Utiliser la configuration par défaut", "poll_settings_basic_usage_detail": "Par défaut Pollen vous propose : ", @@ -183,7 +183,7 @@ "poll_settings_continuousResult": "Voir les résultats en continue", "poll_settings_choicesConfiguration": "Configuration des choix", "poll_settings_votersConfiguration": "Configuration des participants", - "poll_settings_voters": "Renseigner la liste des participants", + "poll_settings_voters": "Renseignez la liste des participants", "poll_settings_addChoices": "Ajout de choix par les participants", "poll_settings_limitChoices": "Limiter le nombre de choix par vote", "poll_settings_votesConfiguration": "Configuration des votes", @@ -227,7 +227,7 @@ "poll_voters_restrictedPoll_withMe": "Je participe au sondage", "poll_voters_restrictedPoll_withGroup": "Organiser les invités dans des groupes", "poll_voters_invite": "Inviter des participants", - "poll_voters_invite_label": "Renseigner le courriel des participants (séparé par un espace)", + "poll_voters_invite_label": "Renseignez le courriel des participants (séparé par un espace)", "poll_created_title": "Sondage créé", "poll_created_message": "Le sondage vient d'être créé. Un courriel vous a été adressé ainsi qu'aux éventuels participants.", "poll_created_edit": "Pour gérer le sondage, veuillez utiliser le lien suivant", @@ -251,9 +251,9 @@ "users_BANNED": "Banni", "choice_description_placeholder": "Vous pouvez saisir une description", "date-picker_today": "Aujourd'hui", - "choice_text": "Renseigner un text", + "choice_text": "Renseignez un text", "choice_ressource": "Utiliser une image", - "choice_date": "Renseigner une date", + "choice_date": "Renseignez une date", "choice_time": "Ajouter une heure à la date", "choice_description": "Ajouter un descriptif du choix" }, diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html index 94e840a..7dcfdf9 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html @@ -40,7 +40,9 @@ require("./HeaderI18n.tag.html"); <HeaderI18n/> <div class="dropdown"> - <a class="header-link"><i class="fa fa-ellipsis-v"/></a> + <a class="header-link"> + <i class="fa fa-{user ? 'user' : 'ellipsis-v'}"/> {user && user.name} + </a> <div class="dropdown-content right"> <virtual if="{!user}"> <a onclick="{signIn}">{__.signin}</a> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm