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 2b6afd92ef01cca3aaaea19076dcf4b075d92fe0 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 5 15:18:05 2017 +0200 fixes #151 placement du bouton --- pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + .../src/main/web/tag/UserProfile.tag.html | 26 +++++++++++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 91e85b3e..6fabe3ea 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -398,6 +398,7 @@ "user_cancel": "Cancel", "user_save": "Save", "userProfile_title": "My profile", + "userProfile_deleteAccount": "Delete your account", "userProfile_identity": "Identity", "userProfile_name": "Name", "userProfile_name_placeholder": "Enter your user name", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 43a10aec..7d04f77d 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -398,6 +398,7 @@ "user_cancel": "Annuler", "user_save": "Enregistrer", "userProfile_title": "Mon profil", + "userProfile_deleteAccount": "Supprimer votre compte", "userProfile_identity": "Identité", "userProfile_name": "Nom", "userProfile_name_placeholder": "Entrez votre nom d'utilisateur", diff --git a/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html b/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html index f4cc3cb6..6624a4f7 100644 --- a/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html @@ -23,7 +23,12 @@ require("./components/LetterAvatar.tag.html"); <UserProfile> <div class="container"> - <h1><i class="fa fa-user"/> {__.title}</h1> + <h1> + <span class="title"><i class="fa fa-user"/> {__.title}</span> + <button class="c-button c-button--error title-button" title="{__.deleteAccount}" onclick="{deleteAccount}"> + <i class="fa fa-trash"/> + </button> + </h1> <div class="main-content"> <div class="row-content"> @@ -200,10 +205,6 @@ require("./components/LetterAvatar.tag.html"); </div> </div> </div> - <div> - <h3 class="c-heading"><i class="fa fa-sign-in"/> {__.avatar}</h3> - <button class="c-button c-button--error" onclick="{deleteAccount}">desinscription</button> - </div> </div> </div> @@ -372,6 +373,21 @@ require("./components/LetterAvatar.tag.html"); <style> + h1 { + display: flex; + align-items: flex-start; + } + + h1 .title { + flex-grow: 1; + } + + h1 .title-button { + font-size: 1rem; + margin: 0 2px; + flex-shrink: 0; + } + .main-content { display: flex; flex-wrap: wrap; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.