diff --git a/docs-web/src/main/webapp/src/app/docs/app.js b/docs-web/src/main/webapp/src/app/docs/app.js index 608a0ab7..e578bc7c 100644 --- a/docs-web/src/main/webapp/src/app/docs/app.js +++ b/docs-web/src/main/webapp/src/app/docs/app.js @@ -345,7 +345,8 @@ angular.module('docs', prefix: 'locale/', suffix: '.json' }) - .registerAvailableLanguageKeys(['en', 'fr'], { + .registerAvailableLanguageKeys(['en', 'fr', 'zh_CN', 'zh_HK', 'zh_TW'], { + 'zh_*': 'zh_CN', 'en_*': 'en', 'fr_*': 'fr', '*': 'en' @@ -354,7 +355,7 @@ angular.module('docs', .fallbackLanguage('en'); // Configuring Timago - timeAgoSettings.overrideLang = $translateProvider.proposedLanguage; + timeAgoSettings.overrideLang = $translateProvider.preferredLanguage(); timeAgoSettings.fullDateAfterSeconds = 60 * 60 * 24 * 30; // 30 days // Configuring $http to act like jQuery.ajax diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Footer.js b/docs-web/src/main/webapp/src/app/docs/controller/Footer.js new file mode 100644 index 00000000..f5a60448 --- /dev/null +++ b/docs-web/src/main/webapp/src/app/docs/controller/Footer.js @@ -0,0 +1,26 @@ +'use strict'; + +/** + * Footer controller. + */ +angular.module('docs').controller('Footer', function($scope, Restangular, $translate, timeAgoSettings) { + // Load app data + Restangular.one('app').get().then(function(data) { + $scope.app = data; + }); + + $scope.currentLang = $translate.use(); + + // Change the current language and save it to local storage + $scope.changeLanguage = function(lang) { + $translate.use(lang); + timeAgoSettings.overrideLang = lang; + localStorage.overrideLang = lang; + $scope.currentLang = lang; + }; + + // Set the current language if an override is saved in local storage + if (!_.isUndefined(localStorage.overrideLang)) { + $scope.changeLanguage(localStorage.overrideLang); + } +}); \ No newline at end of file diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js b/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js index adbef67b..20c75b19 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js @@ -3,7 +3,7 @@ /** * Navigation controller. */ -angular.module('docs').controller('Navigation', function($scope, $http, $state, $rootScope, User, Restangular) { +angular.module('docs').controller('Navigation', function($scope, $state, $rootScope, User, Restangular) { User.userInfo().then(function(data) { $rootScope.userInfo = data; }); diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js index e093f02c..ea370ac1 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js @@ -4,11 +4,6 @@ * Document default controller. */ angular.module('docs').controller('DocumentDefault', function($scope, $rootScope, $state, Restangular, $upload, $translate) { - // Load app data - Restangular.one('app').get().then(function(data) { - $scope.app = data; - }); - // Load user audit log Restangular.one('auditlog').get().then(function(data) { $scope.logs = data.logs; diff --git a/docs-web/src/main/webapp/src/img/sismics.png b/docs-web/src/main/webapp/src/img/sismics.png deleted file mode 100644 index b4b22e20..00000000 Binary files a/docs-web/src/main/webapp/src/img/sismics.png and /dev/null differ diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html index f267d780..087c9349 100644 --- a/docs-web/src/main/webapp/src/index.html +++ b/docs-web/src/main/webapp/src/index.html @@ -44,6 +44,9 @@ + + + @@ -55,10 +58,8 @@ - - @@ -149,9 +150,28 @@
-
-