From garandel@users.chorem.org Fri May 16 14:11:00 2014
From: garandel@users.chorem.org
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] r3956 - in	trunk/pollen-ui-angular/src/main/webapp:
 . js js/controllers	partials
Date: Fri, 16 May 2014 14:11:00 +0200
Message-ID: <20140516121100.A5D98181DA7@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3771980766761545104=="

--===============3771980766761545104==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: garandel
Date: 2014-05-16 14:11:00 +0200 (Fri, 16 May 2014)
New Revision: 3956

Url: http://forge.chorem.org/projects/pollen/repository/revisions/3956

Log:
debug ui and translate to french all element


Modified:
   trunk/pollen-ui-angular/src/main/webapp/index.html
   trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
   trunk/pollen-ui-angular/src/main/webapp/js/services.js
   trunk/pollen-ui-angular/src/main/webapp/partials/inline-poll.html
   trunk/pollen-ui-angular/src/main/webapp/partials/poll-list.html
   trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html
   trunk/pollen-ui-angular/src/main/webapp/partials/poll-settings.html
   trunk/pollen-ui-angular/src/main/webapp/partials/poll.html

Modified: trunk/pollen-ui-angular/src/main/webapp/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/index.html	2014-05-16 09:59:58 UT=
C (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/index.html	2014-05-16 12:11:00 UT=
C (rev 3956)
@@ -53,34 +53,34 @@
       </ul>
       <ul class=3D"nav navbar-nav pull-right">
         <li ng-show=3D"!currentUser.login">
-          <a href=3D"#/user/register/">register</a>
+          <a href=3D"#/user/register/">S'enregistrer</a>
         </li>
=20
         <li class=3D"divider-vertical" ng-show=3D"!currentUser.login"></li>
=20
         <li class=3D"dropdown" ng-show=3D"!currentUser.login">
           <a href=3D"#" role=3D"button" class=3D"dropdown-toggle" data-toggl=
e=3D"dropdown">
-            login<strong class=3D"caret"></strong>
+            Connexion<strong class=3D"caret"></strong>
           </a>
=20
           <div class=3D"dropdown-menu form" role=3D"menu">
             <form id=3D'loginForm'>
=20
               <div class=3D"control-group">
-                <label class=3D"control-label">Login</label>
+                <label class=3D"control-label">Utilisateur</label>
                 <input type=3D"text" name=3D'login' />
                 <span class=3D"help-block hide"></span>
               </div>
=20
               <div class=3D"control-group">
-                <label class=3D"control-label" >Password</label>
+                <label class=3D"control-label" >Mot de Passe</label>
                 <input type=3D"password" name=3D'password' />
                 <span class=3D"help-block hide"></span>
               </div>
=20
               <div class=3D"control-group">
                 <label class=3D"control-label checkbox" >
-                  <input type=3D"checkbox" name=3D'rememberMe'> Remember Me
+                  <input type=3D"checkbox" name=3D'rememberMe'> Connexion au=
tomatique
                 </label>
               </div>
=20
@@ -104,7 +104,7 @@
=20
             <li class=3D"divider" role=3D"presentation"></li>
             <li role=3D"presentation">
-              <a id=3D'menuItemLogout'>logout</a>
+              <a id=3D'menuItemLogout'>Deconnexion</a>
             </li>
=20
           </ul>

Modified: trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js	2014-0=
5-16 09:59:58 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js	2014-0=
5-16 12:11:00 UTC (rev 3956)
@@ -92,13 +92,13 @@
       if (angular.isDefined($scope.restError)) {
         delete $scope.restError.choice;
       }
-      popupChoice(choice, 'Add Choice', $scope.callBackAddChoice);
+      popupChoice(choice, 'Ajout d\'un Choix', $scope.callBackAddChoice);
   }
=20
   $scope.callBackAddChoice =3D function (choice) {}
=20
   $scope.editChoice =3D function (choice) {
-    popupChoice(choice, 'Edit Choice', $scope.callBackEditChoice);
+    popupChoice(choice, 'Edition du Choix', $scope.callBackEditChoice);
   }
=20
   $scope.callBackEditChoice =3D function (choice) {}
@@ -186,7 +186,7 @@
     poll.choice =3D angular.copy($scope.data.choices);
     Poll.add(poll, function (data) {
       $cookieStore.put('saved', true);
-      $location.url('/poll/edit/'+data.topiaId+'?token=3D'+data.permission);
+      $location.url('/poll/edit/'+data.id+'?token=3D'+data.permission);
     }, function (error) {
       $scope.globalVariables.restError =3D true;
       $scope.restError =3D error.data;
@@ -220,7 +220,7 @@
   }
=20
   $scope.callBackEditChoice =3D function (choice) {
-    PollChoice.update({permission:$routeParams.token, pollId:$routeParams.po=
llId, choiceId:choice.topiaId}, choice, function() {
+    PollChoice.update({permission:$routeParams.token, pollId:$routeParams.po=
llId}, choice, function() {
       delete choice.restError;
       $scope.globalVariables.saved =3D true;
     }, function (error) {
@@ -229,7 +229,7 @@
   }
=20
   $scope.deleteChoice =3D function (choice) {
-    PollChoice.delete({pollId:$routeParams.pollId, permission:$routeParams.t=
oken, choiceId: choice.topiaId}, function () {
+    PollChoice.delete({pollId:$routeParams.pollId, permission:$routeParams.t=
oken, choiceId: choice.id}, function () {
       $scope.globalVariables.saved =3D true;
       var index =3D $scope.data.choices.indexOf(choice);
       if (index > -1) {
@@ -309,11 +309,11 @@
=20
   var initVote =3D function () {
     $scope.data.vote =3D {};
-    $scope.data.vote.voter =3D {name : ""};
+    $scope.data.vote.voterName =3D "";
     $scope.data.vote.anonymous =3D false;
     $scope.data.vote.choice =3D [];
     for (var i =3D 0; i < $scope.data.choices.length; ++i) {
-        $scope.data.vote.choice.push({choiceId:$scope.data.choices[i].topiaI=
d, voteValue:false});
+        $scope.data.vote.choice.push({choiceId:$scope.data.choices[i].id, vo=
teValue:false});
     }
   }
=20

Modified: trunk/pollen-ui-angular/src/main/webapp/js/services.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/js/services.js	2014-05-16 09:59:5=
8 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/js/services.js	2014-05-16 12:11:0=
0 UTC (rev 3956)
@@ -22,7 +22,7 @@
=20
 .factory('Poll', ['$resource', function ($resource) {
=20
-  return $resource(conf.restURL+'/polls/:pollId/:cmd', {pollId:'@topiaId'}, {
+  return $resource(conf.restURL+'/polls/:pollId/:cmd', {pollId:'@id'}, {
     'add' : {
       method : 'POST',
       transformRequest : function (data, headersGetter) {
@@ -46,7 +46,7 @@
     return 'choice=3D'+encodeURIComponent(JSON.stringify(data));
   };
=20
-  return $resource(conf.restURL+'/polls/:pollId/choices/:choiceId', {choiceI=
d : '@topiaId'},
+  return $resource(conf.restURL+'/polls/:pollId/choices/:choiceId', {choiceI=
d : '@id'},
     {
       'add' : {
         method:'POST',
@@ -70,7 +70,7 @@
     return 'vote=3D'+encodeURIComponent(JSON.stringify(data));
   };
=20
-  return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@=
topiaId'},
+  return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@=
id'},
     {
       'add' : {
         method:'POST',

Modified: trunk/pollen-ui-angular/src/main/webapp/partials/inline-poll.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/inline-poll.html	2014-05=
-16 09:59:58 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/inline-poll.html	2014-05=
-16 12:11:00 UTC (rev 3956)
@@ -28,7 +28,7 @@
         <td ng-repeat=3D"choice in data.choices" class=3D"pollChoice pollAni=
m" ng-mouseenter=3D"showEditHover =3D true" ng-mouseleave=3D"showEditHover =
=3D false">
           <div ng-if=3D"choice.choiceType =3D=3D 'TEXT'" edit-me=3D"showEdit=
" >
             <div ng-hide=3D"showEdit && !globalVariables.voted" class=3D"fix=
e-input" title=3D"{{choice.description}}">
-              {{choice.name || 'click for edit'}}
+              {{choice.name || 'click pour =C3=A9diter'}}
               <info-Error error=3D"choice.restError.name[0]" data=3D"choice.=
name"></info-Error>
               <input type=3D"button" class=3D"btn btn-default" ng-if=3D"!glo=
balVariables.voted && globalVariables.editMode" ng-show=3D"showEditHover" ng-=
click=3D"editChoice(choice)" value=3D"..."/></div>
             <div ng-show=3D"showEdit && !globalVariables.voted">
@@ -50,7 +50,7 @@
=20
 <!-- begin input vote -->
       <tr ng-show=3D"!globalVariables.editMode">
-        <td class=3D"pollChoice"> <input type=3D"text" class=3D"form-control=
" placeholder=3D"votre nom" ng-model=3D"data.vote.voter.name" /> </td>
+        <td class=3D"pollChoice"> <input type=3D"text" class=3D"form-control=
" placeholder=3D"votre nom" ng-model=3D"data.vote.voterName" /> </td>
         <td ng-repeat=3D"choice in data.vote.choice" class=3D"pollChoice">
           <input type=3D"checkbox" name=3D"{{choice.choice.topiaId}}" ng-mod=
el=3D"choice.voteValue" />
         </td>
@@ -62,7 +62,7 @@
=20
 <!-- begin print vote -->
       <tr ng-repeat=3D"vote in data.votants track by $index" class=3D"pollAn=
im" ng-show=3D"!globalVariables.editMode">
-        <td class=3D"pollChoice"> {{vote.voter.name}}</td>
+        <td class=3D"pollChoice"> {{vote.voterName}}</td>
         <td ng-repeat=3D"choice in vote.choice" class=3D"pollChoice">
           <input type=3D"checkbox" ng-model=3D"choice.voteValue" disabled />
         </td>

Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll-list.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/poll-list.html	2014-05-1=
6 09:59:58 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/poll-list.html	2014-05-1=
6 12:11:00 UTC (rev 3956)
@@ -1,6 +1,6 @@
=20
 <div ng-repeat=3D"poll in data.polls">
-  <h2><a href=3D"#/poll/vote/{{poll.topiaId}}">{{poll.title}}</a> <a href=3D=
"#/poll/edit/{{poll.topiaId}}?token=3D{{poll.creator.permission.token}}"><i c=
lass=3D"glyphicon glyphicon-pencil"></i></a></h2>
+  <h2><a href=3D"#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href=3D"#/po=
ll/edit/{{poll.id}}?token=3D{{poll.permission}}"><i class=3D"glyphicon glyphi=
con-pencil"></i></a></h2>
   <p ng-bind-html=3D"toHTML(poll.description)"></p>
   <hr/>
 </div>
\ No newline at end of file

Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.h=
tml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html	20=
14-05-16 09:59:58 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html	20=
14-05-16 12:11:00 UTC (rev 3956)
@@ -62,8 +62,8 @@
     </div>
   </div>
   <div class=3D"modal-footer">
-    <button type=3D"button" class=3D"btn btn-danger" ng-click=3D"deleteChoic=
e(choice)">Delete</button>
-    <button type=3D"button" class=3D"btn btn-default" ng-click=3D"cancelChoi=
ce()">Cancel</button>
-    <button type=3D"button" class=3D"btn btn-primary" ng-click=3D"saveChoice=
()">Save</button>
+    <button type=3D"button" class=3D"btn btn-danger" ng-click=3D"deleteChoic=
e(choice)">Supprimer</button>
+    <button type=3D"button" class=3D"btn btn-default" ng-click=3D"cancelChoi=
ce()">Annuler</button>
+    <button type=3D"button" class=3D"btn btn-primary" ng-click=3D"saveChoice=
()">Sauvegarder</button>
   </div>
 </form>
\ No newline at end of file

Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll-settings.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/poll-settings.html	2014-=
05-16 09:59:58 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/poll-settings.html	2014-=
05-16 12:11:00 UTC (rev 3956)
@@ -49,11 +49,18 @@
=20
     <div class=3D"form-group">
       <label class=3D"col-lg-4 control-label">R=C3=A9sultat : </label>
+      <div class=3D"col-lg-8">
+        <label><input type=3D"radio" ng-model=3D"data.poll.resultVisibility"=
 name=3D"resultVisibility" value=3D"EVERYBODY" /> Public</label>
+        <label><input type=3D"radio" ng-model=3D"data.poll.resultVisibility"=
 name=3D"resultVisibility" value=3D"VOTER" /> Participants</label>
+        <label><input type=3D"radio" ng-model=3D"data.poll.resultVisibility"=
 name=3D"resultVisibility" value=3D"CREATOR" /> Cr=C3=A9ateur</label>
+      </div>
+      <!--
       <div class=3D"col-lg-8 btn-group">
         <button type=3D"button" class=3D"btn btn-success" ng-model=3D"data.p=
oll.resultVisibility" btn-radio=3D"'EVERYBODY'">Public</button>
         <button type=3D"button" class=3D"btn btn-success" ng-model=3D"data.p=
oll.resultVisibility" btn-radio=3D"'VOTER'">Participants</button>
         <button type=3D"button" class=3D"btn btn-success" ng-model=3D"data.p=
oll.resultVisibility" btn-radio=3D"'CREATOR'">Cr=C3=A9ateur</button>
       </div>
+      -->
     </div>
=20
     <div class=3D"form-group">

Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/poll.html	2014-05-16 09:=
59:58 UTC (rev 3955)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/poll.html	2014-05-16 12:=
11:00 UTC (rev 3956)
@@ -30,11 +30,11 @@
   <alert type=3D"warning" ng-if=3D"globalVariables.created"> <a href=3D"#/po=
ll/edit/{{pollId}}"> Edition du sondage </a>.. </alert>
=20
 <tabset>
-<tab heading=3D"Poll">
+<tab heading=3D"Sondage">
=20
   <div class=3D"pollTitle" edit-me=3D"showEditTitle">
     <h1 ng-hide=3D"showEditTitle">
-      {{data.poll.title || 'Click Me for Editing'}}
+      {{data.poll.title || 'Click pour =C3=A9diter'}}
       <info-Error error=3D"restError.title[0]" data=3D"data.poll.title"></in=
fo-Error>
     </h1>
=20
@@ -59,7 +59,7 @@
   </div>
=20
 </tab>
-<tab heading=3D"Setting" ng-show=3D"globalVariables.editMode" >
+<tab heading=3D"Configuration" ng-show=3D"globalVariables.editMode" >
   <div ng-include=3D"'partials/poll-settings.html'"></div>
 </tab>
 </tabset>
@@ -67,13 +67,13 @@
   <div ng-if=3D"globalVariables.create">
     <hr/>
     <button type=3D"button" class=3D"btn btn-default" ng-model=3D"globalVari=
ables.editMode" btn-checkbox>Mode Edition</button>
-    <button class=3D"btn btn-primary" ng-click=3D"save()">Save</button>
+    <button class=3D"btn btn-primary" ng-click=3D"save()">Sauvegarder</butto=
n>
   </div>
=20
   <div ng-if=3D"globalVariables.edit">
     <hr/>
     <button type=3D"button" class=3D"btn btn-default" ng-model=3D"globalVari=
ables.editMode" btn-checkbox>Mode Edition</button>
-    <button class=3D"btn btn-danger" ng-click=3D"delete();">Delete</button>
+    <button class=3D"btn btn-danger" ng-click=3D"delete();">Supprimer</butto=
n>
   </div>
=20
 </form>
\ No newline at end of file


--===============3771980766761545104==--