[Pollen-commits] 03/04: save state of poll menu

27 Jun 2014

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 8fb6f0e1c41d8a984ec9053b8baee894ee1eef50
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Fri Jun 27 18:19:39 2014 +0200

    save state of poll menu
---
 .../src/main/webapp/js/controllers/pollCtrl.js     | 24 ++++++++--------------
 .../src/main/webapp/partials/poll-link.html        | 16 +++++++--------
 2 files changed, 16 insertions(+), 24 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 ca5257e..ff4ee6a 100644
--- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
+++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
@@ -37,28 +37,15 @@ angular.module('pollControllers', [])
 
   $scope.tab = $scope.setTab('home');
 
-  $scope.setUrl = function (exclude) {
-    var url = window.location.origin+window.location.pathname+'#'+$location.path();
-    if ($location.search().length != 0) {
-      url += '?';
-      angular.forEach($location.search(), function(value, key) {
-        if (exclude.indexOf(key) == -1)
-          url += key+'='+value+'&';
-      })
-    }
-    else {
-      url += '?';
-    }
-    return url;
-  };
-
   if (angular.isUndefined($scope.globalVariables)) {
     $scope.globalVariables = {};
 
+    $scope.session = SessionStorage.get();
+    $scope.globalVariables.minify = $scope.session.menuMinify;
+
     /**
      * Sauvegarde du token si non connecté
      */
-    $scope.session = SessionStorage.get();
     if (angular.isUndefined($routeParams.pollToken) && angular.isUndefined($scope.session.id)) { // pas de paramètre url et non connecté
       if (angular.isDefined($scope.session.pollToken) && $scope.session.pollToken != '') { // existe une permission
         $scope.globalVariables.pollToken = $scope.session.pollToken;
@@ -75,6 +62,11 @@ angular.module('pollControllers', [])
     }
   }
 
+  $scope.toggleMinify = function () {
+    $scope.globalVariables.minify = ! $scope.globalVariables.minify
+    SessionStorage.save({'menuMinify': $scope.globalVariables.minify});
+  }
+
   $translate('dateFormat').then(function (dateFormat) {
     $scope.globalVariables.dateFormat = dateFormat;
   });
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 0551923..7d20101 100644
--- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html
+++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html
@@ -19,18 +19,18 @@
   #L%
   -->
 <ul>
-  <li class="toMini" ng-click="globalVariables.minify = !globalVariables.minify">
+  <li class="toMini" ng-click="toggleMinify()">
     <a class="fakeLink" ng-show="globalVariables.minify"><span class="glyphicon glyphicon-chevron-right"></span></a>
     <a class="fakeLink" ng-hide="globalVariables.minify"><span class="glyphicon glyphicon-chevron-left"></span></a>
   </li>
-  <li>
+  <li ng-if="data.poll.id">
     <a href="{{globalVariables.linkVote}}">
       <span class="glyphicon glyphicon-link" title="{{ 'poll.link.vote' | translate }}"></span>
       <span class="text">{{ 'poll.link.vote' | translate }}</span>
     </a>
     <input type="text" select-on-click value="{{globalVariables.linkVote}}" readonly class="form-control input-mini"/>
   </li>
-  <li>
+  <li ng-if="data.poll.id">
     <a href="{{globalVariables.linkResult}}">
       <span class="glyphicon glyphicon-stats" title="{{ 'poll.link.result' | translate }}"></span>
       <span class="text">{{ 'poll.link.result' | translate }}</span>
@@ -40,20 +40,20 @@
   <li class="empty"> </li>
 </ul>
 <ul>
-  <li>
+  <li ng-if="data.poll.permission">
     <a href="{{globalVariables.linkEdit}}">
       <span class="glyphicon glyphicon-pencil" title="{{ 'poll.link.edit' | translate }}"></span>
       <span class="text">{{ 'poll.link.edit' | translate }}</span>
     </a>
     <input type="text" select-on-click value="{{globalVariables.linkEdit}}" readonly class="form-control input-mini"/>
   </li>
-  <li>
+  <li ng-if="data.poll.permission">
     <a class="fakeLink">
       <span class="glyphicon glyphicon-transfer" title="{{ 'poll.link.clone' | translate }}"></span>
       <span class="text">{{ 'poll.link.clone' | translate }} (disabled)</span>
     </a>
   </li>
-  <li>
+  <li ng-if="data.poll.permission">
     <a class="fakeLink">
       <span class="glyphicon glyphicon-export" title="{{ 'poll.link.export' | translate }}"></span>
       <span class="text">{{ 'poll.link.export' | translate }}  (disabled)</span>
@@ -61,13 +61,13 @@
   </li>
 </ul>
 <ul>
-  <li>
+  <li ng-if="data.poll.permission">
     <a class="fakeLink danger">
       <span class="glyphicon glyphicon-remove" title="{{ 'poll.link.close' | translate }}"></span>
       <span class="text">{{ 'poll.link.close' | translate }}</span>
     </a>
   </li>
-  <li>
+  <li ng-if="data.poll.permission">
     <a class="fakeLink danger" ng-click="deletePoll()">
       <span class="glyphicon glyphicon-trash" title="{{ 'poll.link.delete' | translate }}"></span>
       <span class="text">{{ 'poll.link.delete' | translate }}</span>

-- 
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

    

[Pollen-commits] 03/04: save state of poll menu

chorem.org scm