This is an automated email from the git hooks/post-receive script. New commit to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git commit 52a6ea27aeab45fbf7256d14509858965f4a82ee Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:49:04 2014 +0200 fix route in edit poll, fix style title in poll settings --- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- pollen-ui-angular/src/main/webapp/less/style.less | 12 +++++++----- pollen-ui-angular/src/main/webapp/partials/poll.html | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 89b1812..2e95217 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -60,7 +60,7 @@ angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'Polle .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) .when('/poll/create/:tab?', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) - .when('/poll/edit/:pollId/:pollToken?/:tab?', {templateUrl: './partials/poll.html', controller:"PollCtrl"}) + .when('/poll/edit/:pollId/:pollToken?/tab/:tab?', {templateUrl: './partials/poll.html', controller:"PollCtrl"}) .when('/poll/vote/:pollId/:pollToken?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) .when('/poll/vote/:pollId/:pollToken?/vote/:voteToken', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) .when('/poll/result/:pollId/:pollToken?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) 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 1405d47..704b3d1 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -154,12 +154,12 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr if (angular.isDefined($scope.globalVariables.pollToken)) { $scope.globalVariables.linkHome += '/'+$scope.globalVariables.pollToken; $scope.globalVariables.linkEdit += '/'+$scope.globalVariables.pollToken; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/tab/conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/tab/participant'; } else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/tab/conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/tab/participant'; } }); } diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index d87a1b9..3ce7125 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -214,11 +214,13 @@ body { } #poll-content { - h4 { - font-weight: bold; - border-left: 8px solid; - padding-left: 4px; - color: #555; + .poll-settings { + h4 { + font-weight: bold; + border-left: 8px solid; + padding-left: 4px; + color: #555; + } } .pollTitle, .pollDesc { diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index ea5863a..ff2c9dd 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -38,7 +38,7 @@ <div ng-if="!globalVariables.create && (tab == 'edit' || tab == 'conf' || tab == 'participant')" ng-controller="PollEditCtrl"> <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'edit'" class="anim-fade"></div> - <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade"></div> + <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade poll-settings"></div> <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'" class="anim-fade"></div> </div> @@ -47,7 +47,7 @@ <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'create'" class="anim-fade"></div> - <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade"></div> + <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade poll-settings"></div> <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'" class="anim-fade"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.