This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 106624546e9212dc20fc354dddc1881a3eb522ee Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon May 26 16:00:00 2014 +0200 update home interface of poll --- pollen-ui-angular/src/main/webapp/js/app.js | 11 +++++++++++ pollen-ui-angular/src/main/webapp/partials/poll-link.html | 6 ++++-- .../src/main/webapp/partials/poll-popupChoice.html | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 0cc6144..a7b5d62 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -162,6 +162,17 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +.directive('selectOnClick', function () { + return { + restrict: 'A', + link: function (scope, element, attrs) { + element.on('click', function () { + this.select(); + }); + } + }; +}) + .directive('autoSave', function ($timeout) { return { restrict : 'A', diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index 0e00f8b..fefdde1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -19,6 +19,8 @@ #L% --> <div> - <alert type="warning" ng-if="globalVariables.linkEdit && data.poll.permission"> Lien d'édition : <a href="{{globalVariables.linkEdit}}">{{globalVariables.linkEdit}}</a> </alert> - <alert type="success" ng-if="globalVariables.linkVote"> Lien de vote : <a href="{{globalVariables.linkVote}}"> {{globalVariables.linkVote}}</a> </alert> + <h2>Sondage:</h2> + + <alert type="warning" ng-if="globalVariables.linkEdit && data.poll.permission"> Lien d'édition : <input type="text" select-on-click value="{{globalVariables.linkEdit}}" readonly class="form-control"/> </alert> + <alert type="success" ng-if="globalVariables.linkVote"> Lien de partage pour le vote : <input type="text" select-on-click value="{{globalVariables.linkVote}}" readonly class="form-control"/> </alert> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index d17db00..a2d05ce 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -39,7 +39,7 @@ <label for="popNameChoiceCheck" class="col-sm-4 control-label">Nom du Choix : </label> <div class="col-sm-6"> - <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" /> + <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" focus-me="choice.choiceType == 'TEXT'"/> </div> </div> @@ -49,7 +49,7 @@ <div class="col-sm-6"> <div class="right-inner-addon "> <i class="glyphicon glyphicon-calendar glyphicon-input"></i> - <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true"/> + <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> </div> </div> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.