Repository: syncope
Updated Branches:
  refs/heads/2_0_X 6bb3673ab -> f9fcde0d3


[SYNCOPE-960] turns the breadcrumb navigable once arrived in the last page in 
self creation


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9fcde0d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9fcde0d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9fcde0d

Branch: refs/heads/2_0_X
Commit: f9fcde0d3f49259a7148061af996cb222eff6898
Parents: 6bb3673
Author: Matteo Di Carlo <matteo.dica...@tirasa.net>
Authored: Thu Oct 13 15:15:23 2016 +0200
Committer: Matteo Di Carlo <matteo.dica...@tirasa.net>
Committed: Thu Oct 13 16:36:51 2016 +0200

----------------------------------------------------------------------
 .../app/js/controllers/TailController.js        |  7 ++--
 .../app/js/controllers/UserController.js        |  1 +
 .../resources/app/languages/de/dynamic.json     | 26 +++++++-------
 .../resources/app/languages/de/static.json      | 36 ++++++++++----------
 .../META-INF/resources/app/views/editUser.html  |  2 +-
 .../resources/app/views/user-resources.html     |  1 -
 6 files changed, 37 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
 
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
index 69de101..fe880a3 100644
--- 
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
+++ 
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
@@ -20,9 +20,10 @@
 'use strict';
 
 angular.module("self")
-        .controller("TailController", 
-                function ($scope, $location) {
+        .controller("TailController", ['$scope', '$rootScope', '$location',
+                function ($scope, $rootScope, $location) {
                   $scope.redirect = function () {
                     $location.path('/self');
+                    $rootScope.endReached = false;
                   };
-                });
+                }]);

http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
 
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index 7e84c17..2366311 100644
--- 
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++ 
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -513,6 +513,7 @@ angular.module("self").controller("UserController", 
['$scope', '$rootScope', '$l
     $scope.logout = function (message) {
       AuthService.logout().then(function (response) {
         console.info("Logout successfully");
+        $rootScope.endReached = false;
         $location.path('/self');
         if (message) {
           $scope.showSuccess(message, $scope.notification);

http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
 
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
index aacf5ac..e4f50d3 100644
--- 
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
+++ 
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
@@ -1,26 +1,26 @@
 {
-  "credentials": "Details",
+  "credentials": "Anmeldedaten",
   "groups": "Gruppen",
   "plainSchemas": "PlainSchemas",
   "derivedSchemas": "DerivedSchemas",
   "virtualSchemas": "VirtualSchemas",
   "resources": "Ressourcen",
-  "finish": "Finish",
+  "finish": "Ende",
   "fullname": "vollständiger Name",
-  "userId": "benutzer Id",
-  "loginDate": "login Datum",
-  "firstname": "name",
-  "surname": "familien-oder nachname",
+  "userId": "Benutzer-ID",
+  "loginDate": "Login-Datum",
+  "firstname": "Vorname",
+  "surname": "Familien- oder Nachname",
   "ctype": "ctype",
   "email": "email",
-  "activationDate": "aktivierungsdatum ",
-  "uselessReadonly": "uselessReadonly",
+  "activationDate": "Aktivierungsdatum ",
+  "uselessReadonly": "unnötig, nur zum lesen",
   "cool": "cool",
-  "gender": "geschlecht",
+  "gender": "Geschlecht",
   "aLong": "aLong",
-  "makeItDouble": "makeItDouble",
-  "obscure": "obscure",
-  "photo": "foto",
+  "makeItDouble": "verdoppeln",
+  "obscure": "undeutlich",
+  "photo": "Foto",
   "GROUPS": "Gruppen",
   "AUXILIARY CLASSES": "Hilfsklassen"
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
 
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
index 3d67d89..db47711 100644
--- 
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
+++ 
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
@@ -1,9 +1,9 @@
 {
   "USER": "Benutzer",
-  "CHOSENLANGUAGE": "Gewählte sprache",
-  "CAPTCHA": "Bitte geben sie den code im bild angezeigt.",
+  "CHOSENLANGUAGE": "Gewählte Sprache",
+  "CAPTCHA": "Captcha",
   "PASSWORD_PLACEHOLDER": "Passwort",
-  "PASSWORD_RESET": "Passwort reset",
+  "PASSWORD_RESET": "Passwort-Reset",
   "CONFIRM_PASSWORD_RESET": "Bestätigen Sie Passwort-Reset",
   "NOTSECURE": "Nicht sicher!",
   "ALMOSTSECURE": "Sicher, aber man könnte es besser machen",
@@ -12,13 +12,13 @@
   "PASSWORD_CHANGE_REQUIRED": "Passwortänderung erforderlich",
   "PASSWORD_CHANGE": "Passwortänderung",
   "CONFIRM_PASSWORD": "Bestätige das Passwort",
-  "CONFIRM_PASSWORD_PLACEHOLDER": "Bestätige das passwort",
+  "CONFIRM_PASSWORD_PLACEHOLDER": "Bestätige das Passwort",
   "VERYGOOD": "Sehr gut!",
   "PASSWORD_STRENGTH": "Passwort-Sicherheit",
   "NEXT": "Nächster",
   "PREVIOUS": "Früher",
   "SAVE": "Speichern",
-  "FINISH": "Finish",  
+  "FINISH": "Ende",  
   "USERDETAILS": "Nutzerdetails",
   "SECURITYQUESTION": "Sicherheitsfrage",
   "SELECTSECURITYQUESTION": "Wählen Sie die Sicherheitsfrage",
@@ -28,7 +28,7 @@
   "SELFREGISTRATION": "Selbstregistrierung",
   "PASSWORDRESET": "Passwort zurücksetzen",
   "USERNAME": "Benutzername",
-  "USERNAME_PLACEHOLDER": "Benutzername",
+  "USERNAME_PLACEHOLDER": "Benutzernamen",
   "PASSWORD": "Passwort",
   "LOGIN": "Anmeldung",
   "LANGUAGES": "Sprachen",
@@ -36,22 +36,22 @@
   "ITALIAN": "Italienisch",
   "GERMAN": "Deutsch",
   "GROUPS": "Gruppen",
-  "GROUPS_PLACEHOLDER": "Klicken sie auf gruppen auszuwählen...",
+  "GROUPS_PLACEHOLDER": "Klicken sie auf Gruppen um auszuwählen...",
   "AUXILIARY CLASSES": "Hilfsklassen",
-  "AUXILIARY_CLASSES_PLACEHOLDER": "Klicken sie auf hilfsklasse zu wählen",
-  "CREDENZIALI": "Details",
+  "AUXILIARY_CLASSES_PLACEHOLDER": "Klicken sie auf Hilfsklasse um 
auszuwählen",
+  "CREDENZIALI": "Anmeldedaten",
   "PLAINSCHEMAS": "PlainSchemas",
-  "DERIVEDSCHEMAS": "Abgeleitet schemen",
-  "VIRTUALSCHEMAS": "Virtuelle Schemen",
+  "DERIVEDSCHEMAS": "DerivedSchemas",
+  "VIRTUALSCHEMAS": "VirtualSchemas",
   "RESOURCES": "Ressourcen",
-  "RESOURCES_PLACEHOLDER": "Klicken sie auf ressourcen zu wählen...",
+  "RESOURCES_PLACEHOLDER": "Wählen Sie ressourcen...",
   "REALM": "Realm",
-  "NEWUSER": "Neuer benutzer",
-  "SUCCESSFULLY_CREATED": "succes aangemaakt",
-  "SUCCESSFULLY_UPDATED": "succesvol geüpdatet",
-  "PASSWORD_UPDATED": ": password succesfully updated",
-  "GOBACKHOME": "Klik op deze link om terug te gaan naar de home page",
-  "CONFIRM_REMOVE": "This will remove the current value. Continue?",
+  "NEWUSER": "Neuer Benutzer",
+  "SUCCESSFULLY_CREATED": "erfolgreich erstellt",
+  "SUCCESSFULLY_UPDATED": "erfolgreich aktualisiert",
+  "PASSWORD_UPDATED": "Passwort erfolgreich aktualisisert",
+  "GOBACKHOME": "Hier klicken um zur Homepage zurück zu gelangen",
+  "CONFIRM_REMOVE": "Löschen bestätigen",
   "own": "Besitzen"
 }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html 
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
index caa17a8..8ce34fe 100644
--- 
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
+++ 
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
@@ -35,7 +35,7 @@ under the License.
               <a id="logout" class="btn btn-default" ng-show="!createMode" 
ng-click="logout()"><i class="glyphicon glyphicon-off"style="color:red"></i></a>
               <!--add class breadcrumb-disabled-link to buttons to prevent 
click-->              
               <a ng-repeat="(key, value) in wizard" ui-sref-active="active" 
ui-sref=".{{key}}" class="btn btn-default" 
-                 ng-class="createMode ? 'disable-link' : ''">{{key | 
translate}}</a>       
+                 ng-class="createMode && !endReached ? 'disable-link' : 
''">{{key | translate}}</a>       
             </div>
           </div>
         </div>

http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
 
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
index 0c2b2db..9d27a61 100644
--- 
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
+++ 
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
@@ -20,7 +20,6 @@ under the License.
   <resources form="dynamicForm" user="user"></resources>
 </div>
 <div id="attribute" class="form-group row">
-  <button id="save" ng-show="!createMode" type="button" class="btn btn-default 
pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
   <navigation-buttons ng-show="createMode" base="create" current="resources" 
wizard="{{wizard}}"></navigation-buttons>
   <navigation-buttons ng-show="!createMode" base="update" current="resources" 
wizard="{{wizard}}"></navigation-buttons>
 

Reply via email to