[pollen] branch develop updated (90b17a3 -> 86c5e1d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 90b17a3 fix date in poll result new 17426f2 Edit homePage and add footer new f70e0fa improve UI for footer and poll-link new 9ded829 delete opacity on alert:hover new 212307d fix permission on new vote, and fix date in new choice new 81a150c autoSave user in admin part new 86c5e1d Merge branch 'feature/homePage' into develop The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 86c5e1d5ae92235438395bf0a324504aebc34789 Merge: 90b17a3 81a150c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:34:12 2014 +0200 Merge branch 'feature/homePage' into develop commit 81a150c9d2cfc6f07a8cd0701e736fb900555720 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:33:57 2014 +0200 autoSave user in admin part commit 212307d594b9ef3cadc54ae10e5ac839aa61c140 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:30:51 2014 +0200 fix permission on new vote, and fix date in new choice commit 9ded829f9ff09dcc630c647314a09641bbd5b136 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:27:59 2014 +0200 delete opacity on alert:hover commit f70e0fa648e10b57fb55527eaacb6d060a83c41c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 11:30:19 2014 +0200 improve UI for footer and poll-link commit 17426f238c643aa351aa4619fdd815defb3c9580 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 18:50:02 2014 +0200 Edit homePage and add footer Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 3 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/index.html | 14 ++++ .../src/main/webapp/js/controllers/mainCtrl.js | 9 ++- .../src/main/webapp/js/controllers/pollCtrl.js | 8 +-- .../src/main/webapp/js/controllers/userCtrl.js | 4 +- pollen-ui-angular/src/main/webapp/less/style.less | 77 ++++++++++++++-------- .../src/main/webapp/partials/home.html | 16 ++++- .../src/main/webapp/partials/poll-link.html | 7 -- .../src/main/webapp/partials/user-admin-list.html | 3 +- 10 files changed, 95 insertions(+), 47 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 17426f238c643aa351aa4619fdd815defb3c9580 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 18:50:02 2014 +0200 Edit homePage and add footer --- pollen-ui-angular/src/main/webapp/index.html | 14 +++++++++++ .../src/main/webapp/js/controllers/mainCtrl.js | 9 +++++-- pollen-ui-angular/src/main/webapp/less/style.less | 28 +++++++++++++++++++++- .../src/main/webapp/partials/home.html | 16 ++++++++++--- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 5f47cf8..83c7714 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -174,6 +174,20 @@ <div ng-view class='container-fluid' id="content"></div> +<footer> + <a href="http://maven-site.chorem.org/pollen">Pollen</a> + <a href="http://www.chorem.org/projects/pollen/files">{{version}}</a> + <span class="separator">-</span> + <a href="http://www.gnu.org/licenses/agpl.html">Licence</a> + <span class="separator">-</span> + ©2009-2014 + <a href="http://www.codelutin.com/">Code Lutin</a> + <span class="separator">-</span> + <a href="http://www.chorem.org/projects/pollen/issues">Rapport de bug</a> + <span class="separator">-</span> + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">Support utilisateur</a> +</footer> + </body> </html> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js index 0e9ba5e..aacd075 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js @@ -20,8 +20,13 @@ */ 'use strict'; -angular.module('PollenMainControllers', ['pollenServices']).controller('MainCtrl', ['$scope', 'Page', - function ($scope, Page) { +angular.module('PollenMainControllers', ['pollenServices']) +.controller('MainCtrl', ['$scope', '$http', 'Page', + function ($scope, $http, Page) { + + $http.get('version.txt', {'transformResponse':angular.identity}).success(function (data) { + $scope.version = data; + }); $scope.$on('titleChange', function () { $scope.title = Page.title(); diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index e8159ec..223e061 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -39,7 +39,7 @@ /* global min width */ @media screen and (max-width: @responsive-min-width) { - #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link { + #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link, footer { width:@responsive-min-width !important; } } @@ -508,6 +508,32 @@ hr { } +footer { + position: absolute; + bottom: 0px; + width: 100%; + background-color: #222; + color: #999; + text-align: center; + border-top: 1px solid #080808; + + .separator { + padding-left:1.5%; + padding-right:1.5%; + } + + a { + color: #999; + text-decoration:none; + + &:hover { + color:#fff; + background-color:transparent; + text-decoration:none; + } + } +} + .full { position:fixed; top:0%; diff --git a/pollen-ui-angular/src/main/webapp/partials/home.html b/pollen-ui-angular/src/main/webapp/partials/home.html index 54b879a..517506e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/home.html +++ b/pollen-ui-angular/src/main/webapp/partials/home.html @@ -19,6 +19,16 @@ #L% --> -<div> - <img src="img/pollen.png"/> -</div> \ No newline at end of file +<div class="jumbotron"> + <div class="container"> + <h1> + Pollen, Application de sondage + </h1> + <p> + Créer dés maintenant votre sondage gratuitement. Partager le lien de vote. Et regarder le résultat. + </p> + <p class=""> + <a href="#/poll/create" class="btn btn-primary btn-lg"><span class="glyphicon glyphicon-plus-sign"></span> {{ 'newPoll' | translate }}</a> + </p> + </div> +</div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 f70e0fa648e10b57fb55527eaacb6d060a83c41c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 11:30:19 2014 +0200 improve UI for footer and poll-link --- pollen-ui-angular/src/main/webapp/less/style.less | 53 ++++++++++------------ .../src/main/webapp/partials/poll-link.html | 7 --- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 223e061..77ca38f 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -21,6 +21,17 @@ @import "variables.less"; +html { + height: 100%; +} + +body { + position:relative; + margin:0; + min-height:100%; + padding-bottom: 4rem; +} + #pollenMenu { position:fixed; width:100%; @@ -29,7 +40,7 @@ left:0px; } #content { - margin-top:60px; + padding-top:60px; .fade(); #poll-content .anim-fade { @@ -127,9 +138,6 @@ margin-bottom:30px; font-size:1.2em; - &.empty { - display:none; - } &.toMini { text-align:right; } @@ -159,12 +167,11 @@ /* width < @responsive-large-width */ @media screen and (max-width: @responsive-large-width) { - @foot-padding : 1.8%; - @foot-height : 80px; + @foot-height : 125px; #poll-link { text-align:center; - position:fixed; + position:absolute; bottom:0px; left:0px; width:100%; @@ -178,33 +185,19 @@ list-style-type:none; display:inline-block; margin:0px; - padding-left: @foot-padding; - padding-right: @foot-padding; + width:33%; + float:left; + text-align:left; li.toMini { display:none; } } - - input { - display:none; - } - - /* height < @responsive-height */ - @media (max-height: @responsive-height) { - position:relative; - background-color:inherit; - border-color: @borderColor; - } } #poll-content { - margin-bottom: @foot-height + 15px; - - @media (max-height: @responsive-height) { - margin-bottom:0px; - } + margin-bottom: @foot-height; } } @@ -510,16 +503,20 @@ hr { footer { position: absolute; - bottom: 0px; + right: 0; + bottom: 0; + left: 0; + height:20px; width: 100%; background-color: #222; color: #999; text-align: center; border-top: 1px solid #080808; + z-index:1000; .separator { - padding-left:1.5%; - padding-right:1.5%; + padding-left:.75%; + padding-right:.75%; } 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 21fd606..4f8428b 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -40,10 +40,6 @@ </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 ng-if="data.poll.permission"> @@ -84,8 +80,5 @@ <span class="text">{{ 'poll.link.delete' | translate }}</span> </a> </li> - - <li class="empty" ng-hide="!data.poll.isClosed"> </li> - <li class="empty"> </li> </ul> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 9ded829f9ff09dcc630c647314a09641bbd5b136 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:27:59 2014 +0200 delete opacity on alert:hover --- pollen-ui-angular/src/main/webapp/less/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 77ca38f..1fbf93d 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -358,7 +358,7 @@ body { .transition(opacity @short-time-transition ease); &:hover { - opacity:0.7; + opacity:1; .transition(opacity @short-time-transition ease); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 212307d594b9ef3cadc54ae10e5ac839aa61c140 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:30:51 2014 +0200 fix permission on new vote, and fix date in new choice --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 7632638..c8268fe 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -351,7 +351,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } $scope.globalVariables.lastType = 'TEXT'; - $scope.globalVariables.lastDate = null; + $scope.globalVariables.lastDate = new Date(); var initChoice = function () { return { @@ -492,7 +492,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } // set default date - if (angular.isUndefined(choice.choiceValueDate)) { + if (angular.isUndefined(choice.choiceValueDate) || choice.choiceValueDate == "") { choice.choiceValueDate = $scope.globalVariables.lastDate; } @@ -514,7 +514,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } else if (choice.choiceType == 'DATE') { choice.choiceValue = choice.choiceValueDate; - $scope.globalVariables.lastDate = angular.copy(choice.choiceValueDate); + $scope.globalVariables.lastDate = new Date(choice.choiceValueDate); modalCallBack(choiceEdit, choice, callBack) } @@ -1181,7 +1181,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } }); - PollVote.get({pollId:$routeParams.pollId, voteId:returnRequest.id}, function (newVote) { + PollVote.get({pollId:$routeParams.pollId, voteId:returnRequest.id, permission:returnRequest.permission}, function (newVote) { $scope.data.votants.push(newVote); }) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 81a150c9d2cfc6f07a8cd0701e736fb900555720 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:33:57 2014 +0200 autoSave user in admin part --- pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 4 +++- pollen-ui-angular/src/main/webapp/partials/user-admin-list.html | 3 +-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 3ad3439..63dd438 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -41,7 +41,8 @@ var translateEN = { 'user.disableMe' : 'Disable me', 'user.disableMe.success' : 'Disable successfull', 'user.disableUser' : 'Disable user', -'user.disableUser.success' : 'Disable successfull', +'user.disableUser.success' : 'Disable user successfull', +'user.delete.success' : 'Delete user successfull', 'user.generatePassword' : 'Generate new password', 'user.generatePassword.success' : 'E-mail send with new password', 'user.error.password.diff' : 'Passwords not equal', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 81e089f..c9dedc9 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -42,6 +42,7 @@ var translateFR = { 'user.disableMe.success' : 'Désactivation de mon compte avec succès', 'user.disableUser' : 'Désactiver l\'utilisateur', 'user.disableUser.success' : 'Désactivation de l\'utilisateur avec succès', +'user.delete.success' : 'Suppression de l\'utilisateur avec succès', 'user.generatePassword' : 'Générer un nouveau mot de passe', 'user.generatePassword.success' : 'Un mail avec le nouveau mot de passe vient d\'être envoyé..', 'user.error.password.diff' : 'Mot de passe différent', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 931c461..1d06329 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -165,7 +165,9 @@ angular.module('userControllers', []) }); $scope.saveUser = function (user) { - User.admin(user); + User.admin(user, function(data) { + $rootScope.$broadcast('newSuccess', 'user.edit.success'); + }); }; $scope.generatePassword = function (user) { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html b/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html index dea16b2..86a92c6 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html @@ -40,10 +40,9 @@ <tr ng-repeat="user in data.users | filter:search" ng-class="{ 'warning':user.isDisabled }"> <td>{{user.name || user.email}}</td> <td> - <input type="checkbox" ng-model="user.administrator" /> + <input type="checkbox" ng-model="user.administrator" auto-save="saveUser(user)"/> </td> <td class="action"> - <button class="btn btn-primary" ng-click="saveUser(user)" title="{{ 'action.save' | translate}}"> <span class="glyphicon glyphicon-save"></span> </button> <button class="btn btn-warning" ng-click="generatePassword(user)" title="{{ 'user.generatePassword' | translate}}"> <span class="glyphicon glyphicon-refresh"></span> </button> <button class="btn btn-warning" ng-click="banUser(user)" ng-disabled="user.isDisabled" title="{{ 'user.disableUser' | translate}}"> <span class="glyphicon glyphicon-ban-circle"></span> </button> <button class="btn btn-danger" ng-click="deleteUser(user)" title="{{ 'action.delete' | translate}}"> <span class="glyphicon glyphicon-trash"></span> </button> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 86c5e1d5ae92235438395bf0a324504aebc34789 Merge: 90b17a3 81a150c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:34:12 2014 +0200 Merge branch 'feature/homePage' into develop pollen-ui-angular/src/main/webapp/i18n/en.js | 3 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/index.html | 14 ++++ .../src/main/webapp/js/controllers/mainCtrl.js | 9 ++- .../src/main/webapp/js/controllers/pollCtrl.js | 8 +-- .../src/main/webapp/js/controllers/userCtrl.js | 4 +- pollen-ui-angular/src/main/webapp/less/style.less | 77 ++++++++++++++-------- .../src/main/webapp/partials/home.html | 16 ++++- .../src/main/webapp/partials/poll-link.html | 7 -- .../src/main/webapp/partials/user-admin-list.html | 3 +- 10 files changed, 95 insertions(+), 47 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm