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 c04c243ebc2716cb40effce305880e5db163132c Merge: 8aa4813 8fb6f0e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jun 27 18:19:46 2014 +0200 Merge branch 'feature/refontPagePollLink' into develop pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/pom.xml | 22 ++ pollen-ui-angular/src/main/webapp/css/style.css | 321 --------------- pollen-ui-angular/src/main/webapp/i18n/en.js | 4 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 10 +- pollen-ui-angular/src/main/webapp/index.html | 33 +- .../src/main/webapp/js/controllers/pollCtrl.js | 64 ++- pollen-ui-angular/src/main/webapp/less/style.less | 438 +++++++++++++++++++++ .../src/main/webapp/less/variables.less | 12 + .../src/main/webapp/partials/poll-comment.html | 4 +- .../src/main/webapp/partials/poll-link.html | 69 +++- .../src/main/webapp/partials/poll.html | 7 +- 13 files changed, 598 insertions(+), 390 deletions(-) diff --cc pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 9c353ac,ff4ee6a..63c7bfe --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@@ -397,10 -406,10 +406,10 @@@ angular.module('pollControllers', [] $rootScope.$broadcast('newSuccess', 'poll.saved'); if ($scope.data.poll.pollType != 'FREE') { SessionStorage.save({'voterList':$scope.data.voterList}) -- $location.url('/poll/edit/'+data.id+'?token='+data.permission); ++ $location.url('/poll/edit/'+data.id+'/'+data.permission); } else { -- $location.url('/poll/edit/'+data.id+'?token='+data.permission); ++ $location.url('/poll/edit/'+data.id+'/'+data.permission); } }, function (error) { $scope.globalVariables.restError = true; diff --cc pollen-ui-angular/src/main/webapp/partials/poll.html index b974c20,d5005b3..04edd32 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@@ -18,10 -18,10 +18,9 @@@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> - <div> -<div id="poll-content" ng-class="{'maxi-content': globalVariables.minify}"> ++<div id="poll-content" ng-class="{'maxi-content': globalVariables.minify || !data.poll.id}"> <ul class="nav nav-tabs"> -- <li ng-class="{active: tab == 'home'}"><a href="{{globalVariables.linkHome || '#/poll/create/home' }}" ng-click="tab = 'home'"> <span class="glyphicon glyphicon-home"></span> </a></li> <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}" ng-click="tab = 'vote'">{{ 'poll.tab.vote' | translate }}</a></li> <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}" ng-click="tab = 'comment'">{{ 'poll.tab.comment' | translate }}</a></li> <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}" ng-click="tab = 'result'">{{ 'poll.tab.result' | translate }}</a></li> @@@ -43,4 -43,6 +42,6 @@@ <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'"></div> - </div> + </div> + -<div ng-include="'./partials/poll-link.html'" id="poll-link" ng-class="{'mini-link': globalVariables.minify}"></div> ++<div ng-include="'./partials/poll-link.html'" id="poll-link" ng-class="{'mini-link': globalVariables.minify}" ng-show="data.poll.id"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.