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 ae0a1a956c531881548a1bf4ca1ed6ec962df51f Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jun 30 15:15:58 2014 +0200 improve UI --- pollen-ui-angular/src/main/webapp/index.html | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 8 +++---- .../src/main/webapp/partials/alerts.html | 2 +- .../src/main/webapp/partials/poll-link.html | 26 ++++++++++++++++------ .../src/main/webapp/partials/poll-poll.html | 5 ----- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index d120a11..a995313 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -160,7 +160,7 @@ </div> </nav> -<div ng-include="'partials/alerts.html'"></div> +<div ng-include="'partials/alerts.html'" class="pool-alert"></div> <div ng-view class='container-fluid' id="content"></div> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index c81e4da..2fde0fe 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -95,10 +95,6 @@ angular.module('pollControllers', []) }); pollDeferred.promise.then(function () { - if ($scope.data.poll.isClosed) { - $rootScope.$broadcast('newWarning', 'poll.closed', -1); - } - var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; @@ -802,6 +798,10 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { + if ($scope.data.poll.isClosed) { + $rootScope.$broadcast('newWarning', 'poll.closed', -1); + } + var pollChoicePromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; }).$promise; diff --git a/pollen-ui-angular/src/main/webapp/partials/alerts.html b/pollen-ui-angular/src/main/webapp/partials/alerts.html index 17fd0c9..7afa3ab 100644 --- a/pollen-ui-angular/src/main/webapp/partials/alerts.html +++ b/pollen-ui-angular/src/main/webapp/partials/alerts.html @@ -1,3 +1,3 @@ -<div class="pool-alert" ng-controller="printAlertCtrl" > +<div ng-controller="printAlertCtrl" > <alert ng-repeat="alert in data.alerts" type="{{alert.type}}" class="fakeLink" close="hideAlert(alert)" ng-click="hideAlert(alert)"><span class="glyphicon" ng-class="alert.glyphicon"></span> {{ alert.msg | translate }} </alert> </div> \ No newline at end of file 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 87fb324..4c867da 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -23,6 +23,7 @@ <a class="fakeLink" ng-show="globalVariables.minify"><span class="glyphicon glyphicon-chevron-right"></span></a> <a class="fakeLink" ng-hide="globalVariables.minify"><span class="glyphicon glyphicon-chevron-left"></span></a> </li> + <li ng-if="! data.poll.isClosed"> <a href="{{globalVariables.linkVote}}"> <span class="glyphicon glyphicon-link" title="{{ 'poll.link.vote' | translate }}"></span> @@ -30,6 +31,7 @@ </a> <input type="text" select-on-click value="{{globalVariables.linkVote}}" readonly class="form-control input-mini"/> </li> + <li ng-if="data.poll.resultIsVisible"> <a href="{{globalVariables.linkResult}}"> <span class="glyphicon glyphicon-stats" title="{{ 'poll.link.result' | translate }}"></span> @@ -37,42 +39,52 @@ </a> <input type="text" select-on-click value="{{globalVariables.linkResult}}" readonly class="form-control input-mini"/> </li> + + <li class="empty" ng-hide="! data.poll.isClosed"> </li> + <li class="empty" ng-hide="data.poll.resultIsVisible"> </li> <li class="empty"> </li> </ul> -<ul> - <li ng-if="data.poll.permission"> + +<ul ng-if="data.poll.permission"> + <li> <a href="{{globalVariables.linkEdit}}"> <span class="glyphicon glyphicon-pencil" title="{{ 'poll.link.edit' | translate }}"></span> <span class="text">{{ 'poll.link.edit' | translate }}</span> </a> <input type="text" select-on-click value="{{globalVariables.linkEdit}}" readonly class="form-control input-mini"/> </li> - <li ng-if="data.poll.permission"> + + <li> <a class="fakeLink"> <span class="glyphicon glyphicon-transfer" title="{{ 'poll.link.clone' | translate }}"></span> <span class="text">{{ 'poll.link.clone' | translate }} (disabled)</span> </a> </li> - <li ng-if="data.poll.permission"> + + <li> <a class="fakeLink"> <span class="glyphicon glyphicon-export" title="{{ 'poll.link.export' | translate }}"></span> <span class="text">{{ 'poll.link.export' | translate }} (disabled)</span> </a> </li> </ul> -<ul> - <li ng-if="data.poll.permission"> + +<ul ng-if="data.poll.permission"> + <li ng-if="!data.poll.isClosed"> <a class="fakeLink danger" ng-click="closePoll()"> <span class="glyphicon glyphicon-remove" title="{{ 'poll.link.close' | translate }}"></span> <span class="text">{{ 'poll.link.close' | translate }}</span> </a> </li> - <li ng-if="data.poll.permission"> + + <li> <a class="fakeLink danger" ng-click="deletePoll()"> <span class="glyphicon glyphicon-trash" title="{{ 'poll.link.delete' | translate }}"></span> <span class="text">{{ 'poll.link.delete' | translate }}</span> </a> </li> + + <li class="empty" ng-hide="!data.poll.isClosed"> </li> <li class="empty"> </li> </ul> 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 a4497f9..a2c2558 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -51,8 +51,3 @@ <hr/> <button class="btn btn-primary" ng-click="savePoll()"><span class="glyphicon glyphicon-save"></span> {{ 'action.save' | translate }}</button> </div> - -<div ng-if="globalVariables.edit"> - <hr/> - <button class="btn btn-danger" ng-click="deletePoll();"><span class="glyphicon glyphicon-trash"></span> {{ 'action.delete' | translate }}</button> -</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.