[pollen] branch develop updated (c886866 -> 4328891)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from c886866 use pseudo webmotion release new 4328891 fixes #1061 The tooltip and the pen appears on the poll title in the vote page 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 4328891316670e30432f0b9e9ec1acb6455cc85e Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 27 08:53:18 2014 +0200 fixes #1061 The tooltip and the pen appears on the poll title in the vote page Summary of changes: pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 4 ++-- 1 file changed, 2 insertions(+), 2 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 http://git.chorem.org/pollen.git commit 4328891316670e30432f0b9e9ec1acb6455cc85e Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 27 08:53:18 2014 +0200 fixes #1061 The tooltip and the pen appears on the poll title in the vote page --- pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index 1f79513..1d7631c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -20,7 +20,7 @@ --> <div class="pollTitle" edit-me="showEditTitle" novalidate> <h1 ng-hide="showEditTitle"> - <span>{{data.poll.title || 'poll.edit' | translate }}</span> <span class="fa fa-pencil" showonhoverparent ng-if="globalVariables.editMode"></span> + <span tooltip="{{ !globalVariables.editMode ? '' : 'poll.edit' | translate }}">{{data.poll.title || 'poll.edit' | translate }}</span> <span class="fa fa-pencil" showonhoverparent ng-if="globalVariables.editMode"></span> <info-error error="restError.title[0]" data="data.poll.title" append-class="fa-lg"></info-error> </h1> @@ -34,7 +34,7 @@ <div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc" > <div> <span class="fa fa-pencil" style="float: right" showonhoverparent ng-if="globalVariables.editMode"></span> - <div ng-bind-html="toHTML(data.poll.description)"></div> + <div ng-bind-html="toHTML(data.poll.description)" tooltip="{{ !globalVariables.editMode ? '' : 'poll.edit' | translate }}"></div> </div> <div ng-hide="data.poll.description"> <span tooltip="{{ 'poll.edit' | translate }}">{{ 'poll.desc' | translate }}</span> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm