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 9d2a50b2e3223fc5d56fbc8041a063af8e70fcfe Author: Kevin Morin <morin@codelutin.com> Date: Fri Jan 30 17:19:27 2015 +0100 fixes #1160 Add poll title in the page title --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- pollen-ui-angular/src/main/webapp/js/services.js | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) 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 79aaa62..cad7434 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -896,7 +896,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr function ( $scope, $rootScope, $controller, $routeParams, $location, $timeout, $translate, $filter, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, FavoriteList, SessionStorage, Page) { $controller('PollAdminCtrl', {$scope:$scope}); - Page.setTitle('title.poll.edit'); + Page.setTitle('title.poll.edit', $scope.data.poll.title); //////////////////////////////// //// VOTER LIST ///// @@ -1249,7 +1249,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.globalVariables = {}; } - Page.setTitle('title.poll.vote'); + Page.setTitle('title.poll.vote', $scope.data.poll.title); var initPoll = function () { @@ -1540,7 +1540,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.globalVariables = {}; } - Page.setTitle('title.poll.comment'); + Page.setTitle('title.poll.comments', $scope.data.poll.title); if (angular.isDefined($routeParams.commentToken)) { $scope.commentToken = $routeParams.commentToken; @@ -1724,7 +1724,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.globalVariables = {}; } - Page.setTitle('title.poll.result'); + Page.setTitle('title.poll.result', $scope.data.poll.title); $scope.pollDeferred.promise.then(function () { if ($scope.data.poll.pollType == 'GROUP') { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 55112f9..60f5ee9 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -464,12 +464,11 @@ angular.module('pollenServices', ['ngResource']) return { title : function () { var makeTitle = "Pollen"; - if (title != '') { + if (title) { makeTitle += " - " + $filter('translate')(title); - } - if (value !== undefined) { + if (value) { makeTitle += " - " + value; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.