[pollen] branch develop updated (4e0a907 -> bcefcc2)
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 4e0a907 fixes #1059 check poll.maxChoiceNumber before submit poll new bcefcc2 ref #1061 use globalVariables.editMode to hide pencil 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 bcefcc2acca3257f687a4be9030822fbd3998155 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 16:47:49 2014 +0200 ref #1061 use globalVariables.editMode to hide pencil in the vote page Summary of changes: pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 6 +++--- 1 file changed, 3 insertions(+), 3 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 bcefcc2acca3257f687a4be9030822fbd3998155 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 16:47:49 2014 +0200 ref #1061 use globalVariables.editMode to hide pencil in the vote page --- pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b897e46..1f79513 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 tooltip="{{ 'poll.edit' | translate }}">{{data.poll.title || 'poll.edit' | translate }}</span> <span ng-if="true" class="fa fa-pencil" showonhoverparent></span> + <span>{{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> @@ -33,8 +33,8 @@ <div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc" > <div> - <span class="fa fa-pencil" style="float: right" showonhoverparent></span> - <div ng-bind-html="toHTML(data.poll.description)" tooltip="{{ 'poll.edit' | translate }}"></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> <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