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 aa6b1b41d82931e0fd67fb6252716e1c5cea2d50 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 19 19:33:31 2014 +0200 style et ergonomie --- pollen-ui-angular/src/main/webapp/i18n/fr.js | 9 +++++---- pollen-ui-angular/src/main/webapp/js/directives.js | 21 +++++++++++++++++++-- pollen-ui-angular/src/main/webapp/less/style.less | 4 ++-- .../src/main/webapp/less/variables.less | 8 ++------ .../src/main/webapp/partials/big-poll.html | 2 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-poll.html | 16 ++++++++++++---- .../src/main/webapp/partials/poll.html | 2 +- 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 8a284d7..3681d82 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -73,8 +73,8 @@ var translateFR = { 'poll.link.delete' : 'Supprimer le sondage', 'poll.new' : 'Nouveau Sondage', -'poll.edit' : 'Clique pour éditer', -'poll.desc' : 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise', +'poll.edit' : 'Cliquez pour éditer', +'poll.desc' : 'Description (Facultatif). Ce cadre n\'apparait pas si aucune description n\'est saisie.', 'poll.saved' : 'Sondage sauvegardé', 'poll.created.printLink' : 'Garder le lien suivant pour pouvoir modifier votre sondage plus tard, lorsque vous n\'êtes pas connecté : {{url}}', 'poll.cloned' : 'Sondage cloné', @@ -108,7 +108,7 @@ var translateFR = { 'poll.config.label.beginDate' : 'Date de début', 'poll.config.label.endDate' : 'Date de fin', 'poll.config.label.resultVisibility' : 'Visibilité des résultats', -'poll.config.label.continuousResults' : 'Résultat continue', +'poll.config.label.continuousResults' : 'Résultats continus', 'poll.config.label.choiceAddAllowed' : 'Ajout de choix par les votants', 'poll.config.label.beginChoiceDate' : 'Date de début d\'ajout de choix', 'poll.config.label.endChoiceDate' : 'Date de fin d\'ajout de choix', @@ -152,7 +152,7 @@ var translateFR = { 'action.send' : 'Envoyer', 'action.return' : 'Retour', 'action.cancel' : 'Annuler', -'action.save' : 'Sauvegarder', +'action.save' : 'Enregistrer', 'action.edit' : 'Modifier', 'action.delete' : 'Supprimer', 'action.vote' : 'Voter', @@ -173,6 +173,7 @@ var translateFR = { 'action.unselectAll' : 'Déselectionner tous', 'action.toggleSelectAll' : 'Inverser la sélection', 'action.deleteSelected' : 'Supprimer la sélection', +'action.choice.add' : 'Ajouter un choix', 'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', 'action.message.confirmClose' : 'Êtes vous sûr de vouloir le fermer?', diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 1e7bfe1..7c4e02e 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -655,9 +655,26 @@ angular.module('pollenDirective', []) scope.remove = function () { scope.ngModel = null; scope.dateTimePicker.data("DateTimePicker").setDate(null); - element.trigger("change"); } } }; -}]); \ No newline at end of file +}]) + +///////////////////////////////////////////////////////// +// SHOW ON HOVER PARENT // +///////////////////////////////////////////////////////// +.directive('showonhoverparent', + function() { + return { + link : function(scope, element, attrs) { + element.hide(); + element.parent().bind('mouseenter', function() { + element.show(); + }); + element.parent().bind('mouseleave', function() { + element.hide(); + }); + } + }; +}); \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 666903c..c88443e 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -224,6 +224,7 @@ body { .poll-info { background-color: #eee; border-bottom:1px solid @border-color; + margin-bottom: 30px; padding:10px 15px 5px 10px; color: @help-color; @@ -260,8 +261,6 @@ body { .pollTitle, .pollDesc { margin-top:15px; - min-height:60px; - border-radius:5px; padding-left:5px; margin-bottom:30px; } @@ -534,6 +533,7 @@ footer { left: 0; height:@height-footer; width: 100%; + padding: 5px 0; background-color: #222; color: #999; text-align: center; diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index b7a99ac..0b94e75 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -35,7 +35,7 @@ @title-setting-color: #555; @height-pollen-menu : 50px; -@height-footer: 20px; +@height-footer: 30px; @responsive-large-width : 1024px; @responsive-min-width : 800px; @@ -104,11 +104,7 @@ } } -/* override fa-save */ -.@{fa-css-prefix}-save:before { - content: @fa-var-download; -} - +/* override fa-remove */ .@{fa-css-prefix}-remove:before { content: @fa-var-times; } diff --git a/pollen-ui-angular/src/main/webapp/partials/big-poll.html b/pollen-ui-angular/src/main/webapp/partials/big-poll.html index 12cee35..d067aac 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -61,7 +61,7 @@ <div class="row pollBigChoice"> <div class="col-sm-10"> - <button class="btn btn-info" ng-click="addChoice()" ng-if="globalVariables.editMode" ><span class="fa fa-plus"></span> Ajouter un choix</button> + <button class="btn btn-info" ng-click="addChoice()" ng-if="globalVariables.editMode" tooltip="{{ 'action.choice.add' | translate }}"><span class="fa fa-plus"></span> Ajouter un choix</button> </div> <div class="col-sm-2"> <button ng-click="inlineVersion()" class="btn btn-default">inline version</button> diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 649ac25..9c1af2c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -60,7 +60,7 @@ </div> </td> - <td ng-if="data.poll.choiceAddAllowed || globalVariables.editMode"><button class="btn btn-default btn-large" ng-click="addChoice()"> <span class="fa fa-plus"></span> </button></td> + <td ng-if="data.poll.choiceAddAllowed || globalVariables.editMode"><button class="btn btn-default btn-large" ng-click="addChoice()" tooltip="{{ 'action.choice.add' | translate }}"> <span class="fa fa-plus"></span> </button></td> </tr> <!-- end print choice --> 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 59782cb..1d00e5c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -20,7 +20,7 @@ --> <div class="pollTitle" edit-me="showEditTitle" novalidate> <h1 ng-hide="showEditTitle"> - {{data.poll.title || 'poll.edit' | translate }} + <span tooltip="{{ 'poll.edit' | translate }}">{{data.poll.title || 'poll.edit' | translate }}</span> <span class="fa fa-pencil" showonhoverparent></span> <info-error error="restError.title[0]" data="data.poll.title" append-class="fa-lg"></info-error> </h1> @@ -29,9 +29,17 @@ </h1> </div> -<div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc"> - <div ng-bind-html="toHTML(data.poll.description)"></div> - <div ng-hide="data.poll.description ">{{ 'poll.desc' | translate }}</div> +<div ng-include="'./partials/poll-info.html'" ng-controller="PollInfoCtrl" class="poll-info"></div> + +<div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc" > + <div> + <span class="fa fa-pencil" style="float: right" showonhoverparent></span> + <div ng-bind-html="toHTML(data.poll.description)" tooltip="{{ 'poll.edit' | translate }}"></div> + </div> + <div ng-hide="data.poll.description"> + <span tooltip="{{ 'poll.edit' | translate }}">{{ 'poll.desc' | translate }}</span> + <span class="fa fa-pencil" showonhoverparent></span> + </div> </div> <div ng-show="showEditDesc" class="pollDesc"> <textarea id="descEditor" data-ck-editor ng-model="data.poll.description" focus-me="showEditDesc"></textarea> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 84b8645..341bb34 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -33,7 +33,7 @@ <li ng-class="{active: tab == 'participant'}" ng-show="globalVariables.create"><a href="#/poll/create/participant" ng-click="tab = 'participant'"><span class="fa fa-users"></span> {{ 'poll.tab.participant' | translate }} <info-error error="globalVariables.participantError"></info-error></a></li> </ul> - <div ng-include="'./partials/poll-info.html'" ng-controller="PollInfoCtrl" class="poll-info"></div> + <!--<div ng-include="'./partials/poll-info.html'" ng-controller="PollInfoCtrl" class="poll-info"></div>--> <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'vote'" ng-controller="PollVoteCtrl" class="anim-fade"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.