branch feature/pollen-riot-js updated (2dd6e4e -> 8b7730b)
This is an automated email from the git hooks/post-receive script. New change to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 2dd6e4e mise en place du linter pour le js et les tag riot et correction de ces fichiers new 4192d9d fix popup background style: in firefox, it started from the middle of the screen new 063c7d9 Even in dev mode, the emails are sent. By default, the SMTP is configured to be a local devmail instance new 6e9a9d6 style i18n header new 8b7730b refs #2 Create a basic poll : the creator info did not have the right names The 4 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 8b7730bef51d608415680a718b175bab97cafc3e Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:13:33 2017 +0100 refs #2 Create a basic poll : the creator info did not have the right names commit 6e9a9d6b008c79f1fc3c133affe39146ba70457f Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:13:05 2017 +0100 style i18n header commit 063c7d9cf5534790fb4bb5b03c3658d91deee0d0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:12:48 2017 +0100 Even in dev mode, the emails are sent. By default, the SMTP is configured to be a local devmail instance commit 4192d9daa328b1f86e1d289851ef0761aecca55c Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:11:31 2017 +0100 fix popup background style: in firefox, it started from the middle of the screen Summary of changes: pollen-services/src/main/config/PollenServices.ini | 4 +- .../pollen/services/service/mail/EmailService.java | 6 +-- pollen-ui-riot-js/src/main/web/js/PollForm.js | 8 ++-- pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag | 44 +++++++++++++--------- .../src/main/web/tag/poll/CommentPopup.tag | 1 + .../src/main/web/tag/poll/Description.tag | 8 ++-- .../src/main/web/tag/popup/AccountCreated.tag | 1 + .../src/main/web/tag/popup/NewPassword.tag | 1 + .../src/main/web/tag/popup/ResendValidation.tag | 1 + 9 files changed, 43 insertions(+), 31 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 feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 4192d9daa328b1f86e1d289851ef0761aecca55c Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:11:31 2017 +0100 fix popup background style: in firefox, it started from the middle of the screen --- pollen-ui-riot-js/src/main/web/tag/poll/CommentPopup.tag | 1 + pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag | 1 + pollen-ui-riot-js/src/main/web/tag/popup/NewPassword.tag | 1 + pollen-ui-riot-js/src/main/web/tag/popup/ResendValidation.tag | 1 + 4 files changed, 4 insertions(+) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/CommentPopup.tag b/pollen-ui-riot-js/src/main/web/tag/poll/CommentPopup.tag index 3f7f43d..b877e25 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/CommentPopup.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/CommentPopup.tag @@ -107,6 +107,7 @@ opacity: .8; position: absolute; top: 0; + left: 0; } commentpopup.close { diff --git a/pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag b/pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag index f48711d..dc045d6 100644 --- a/pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag +++ b/pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag @@ -77,6 +77,7 @@ opacity: .8; position: absolute; top: 0; + left: 0; } accountcreated.close { diff --git a/pollen-ui-riot-js/src/main/web/tag/popup/NewPassword.tag b/pollen-ui-riot-js/src/main/web/tag/popup/NewPassword.tag index 445cb49..6dd71a4 100644 --- a/pollen-ui-riot-js/src/main/web/tag/popup/NewPassword.tag +++ b/pollen-ui-riot-js/src/main/web/tag/popup/NewPassword.tag @@ -101,6 +101,7 @@ opacity: .8; position: absolute; top: 0; + left: 0; } newpassword.close { diff --git a/pollen-ui-riot-js/src/main/web/tag/popup/ResendValidation.tag b/pollen-ui-riot-js/src/main/web/tag/popup/ResendValidation.tag index 191c8a8..7b0d069 100644 --- a/pollen-ui-riot-js/src/main/web/tag/popup/ResendValidation.tag +++ b/pollen-ui-riot-js/src/main/web/tag/popup/ResendValidation.tag @@ -103,6 +103,7 @@ opacity: .8; position: absolute; top: 0; + left: 0; } resendvalidation.close { -- 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 feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 063c7d9cf5534790fb4bb5b03c3658d91deee0d0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:12:48 2017 +0100 Even in dev mode, the emails are sent. By default, the SMTP is configured to be a local devmail instance --- pollen-services/src/main/config/PollenServices.ini | 4 ++-- .../java/org/chorem/pollen/services/service/mail/EmailService.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pollen-services/src/main/config/PollenServices.ini b/pollen-services/src/main/config/PollenServices.ini index ff86426..e45fdb2 100644 --- a/pollen-services/src/main/config/PollenServices.ini +++ b/pollen-services/src/main/config/PollenServices.ini @@ -106,13 +106,13 @@ defaultValue = localhost description = pollen.configuration.smtpPort key = pollen.smtp.port type = int -defaultValue = 25 +defaultValue = 1025 [option smtpFrom] description = pollen.configuration.smtpFrom key = pollen.smtp.from type = string -defaultValue = "Pollen" +defaultValue = "no-reply@pollen.com" [option logConfigurationFile] description = pollen.configuration.logConfigurationFile diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index b426262..7e7c4ff 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -229,12 +229,10 @@ public class EmailService extends PollenServiceSupport { } } - } else { - - doSend(mail); - } + doSend(mail); + } protected void doSend(PollenMail mail) { -- 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 feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6e9a9d6b008c79f1fc3c133affe39146ba70457f Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:13:05 2017 +0100 style i18n header --- pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag | 44 ++++++++++++++--------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag b/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag index ee696b5..2cd054d 100644 --- a/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag +++ b/pollen-ui-riot-js/src/main/web/tag/HeaderI18n.tag @@ -21,11 +21,10 @@ <HeaderI18n> <div class="dropdown2"> - <a if="{locale == 'en'}" class="hlink {locale}">Language</a> - <a if="{locale == 'fr'}" class="hlink {locale}">Langue</a> + <a class="hlink flag {locale}"><i class="select"></i></a> <div class="dropdown-content2"> - <a onclick="{toEnglish}"><i class="link en"></i>English</a> - <a onclick="{toFrench}"><i class="link fr"></i>Français</a> + <a onclick="{toEnglish}" class="flag en">English</a> + <a onclick="{toFrench}" class="flag fr">Français</a> </div> </div> @@ -56,48 +55,59 @@ text-align: center; justify-content: center; align-items: center; - height: 62px; - padding: 10px 20px; + padding: 0 20px 0 0; cursor: pointer; + height: 41px; } + .select { + display: inline-block; + width: 30px; + height: 41px; + background-image: + linear-gradient(45deg, transparent 50%, gray 50%), + linear-gradient(135deg, gray 50%, transparent 50%); + background-position: + 0px 18px, + 5px 18px; + background-size: + 5px 5px, + 5px 5px; + background-repeat: no-repeat; + } - .en { - background-position-y: center; + .flag { background-repeat: no-repeat; + background-position: 16px center; + } + + .en { background-image: url(../img/en.png); } .fr { - background-position-y: center; - background-repeat: no-repeat; background-image: url(../img/fr.png); } - .link { - padding-left: 20px; - } - .dropdown2 { position: relative; display: inline-block; - width: 120px; } /* Dropdown Content (Hidden by Default) */ .dropdown-content2 { display: none; position: absolute; + right: 10px; background-color: #f9f9f9; - width: 100px; box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2); } /* Links inside the dropdown */ .dropdown-content2 a { - padding: 12px 16px; text-decoration: none; display: block; + padding: 12px 16px 12px 42px; } /* Change color of dropdown links on hover */ -- 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 feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 8b7730bef51d608415680a718b175bab97cafc3e Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 24 10:13:33 2017 +0100 refs #2 Create a basic poll : the creator info did not have the right names --- pollen-ui-riot-js/src/main/web/js/PollForm.js | 8 ++++---- pollen-ui-riot-js/src/main/web/tag/poll/Description.tag | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/js/PollForm.js b/pollen-ui-riot-js/src/main/web/js/PollForm.js index 3e1e226..90e3283 100644 --- a/pollen-ui-riot-js/src/main/web/js/PollForm.js +++ b/pollen-ui-riot-js/src/main/web/js/PollForm.js @@ -49,12 +49,12 @@ class PollForm { this.model.title = "Mon premier sondage"; this.model.description = "Premier sondage!"; - this.model.name = "Dick Laurent"; - this.model.email = "user@pollen.org"; + this.model.creatorName = "Dick Laurent"; + this.model.creatorEmail = "user@pollen.org"; this.mode = "create"; if (user) { - this.model.name = user.name; - this.model.email = user.email; + this.model.creatorName = user.name; + this.model.creatorEmail = user.email; } this.model.voteCountingType = "1"; this.model.participant = []; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag b/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag index f950120..0cbc7ed 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag @@ -23,9 +23,9 @@ <label for="title">{__.title}</label> <input ref="title" type="text" required name="title" value="{model.title}" placeholder="{__.titlePlaceHolder}"> <label for="name">{__.name}</label> - <input ref="name" type="text" required name="name" value="{model.name}" placeholder="{__.namePlaceHolder}"> + <input ref="name" type="text" required name="name" value="{model.creatorName}" placeholder="{__.namePlaceHolder}"> <label for="email">{__.email}</label> - <input ref="email" type="email" required name="email" value="{model.email}" placeholder="{__.emailPlaceHolder}"> + <input ref="email" type="email" required name="email" value="{model.creatorEmail}" placeholder="{__.emailPlaceHolder}"> <br/> <div class="actions"> <a class="button" onclick="{cancel}">{__.cancel}</a> @@ -44,8 +44,8 @@ e.preventDefault(); e.stopPropagation(); this.model.title = this.refs.title.value; - this.model.name = this.refs.name.value; - this.model.email = this.refs.email.value; + this.model.creatorName = this.refs.name.value; + this.model.creatorEmail = this.refs.email.value; this.form.nextStep(); }; this.cancel = () => { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm