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 2faed855..608a0ab7 100644 --- a/docs-web/src/main/webapp/src/app/docs/app.js +++ b/docs-web/src/main/webapp/src/app/docs/app.js @@ -5,14 +5,14 @@ */ angular.module('docs', // Dependencies - ['ui.router', 'ui.route', 'ui.bootstrap', 'ui.keypress', 'ui.validate', 'dialog', 'ngProgress', 'monospaced.qrcode', + ['ui.router', 'ui.route', 'ui.bootstrap', 'ui.keypress', 'ui.validate', 'dialog', 'ngProgress', 'monospaced.qrcode', 'yaru22.angular-timeago', 'ui.sortable', 'restangular', 'ngSanitize', 'ngTouch', 'colorpicker.module', 'angularFileUpload', 'pascalprecht.translate'] ) /** * Configuring modules. */ -.config(function($stateProvider, $httpProvider, RestangularProvider, $translateProvider) { +.config(function($stateProvider, $httpProvider, RestangularProvider, $translateProvider, timeAgoSettings) { // Configuring UI Router $stateProvider .state('main', { @@ -353,6 +353,10 @@ angular.module('docs', .determinePreferredLanguage() .fallbackLanguage('en'); + // Configuring Timago + timeAgoSettings.overrideLang = $translateProvider.proposedLanguage; + timeAgoSettings.fullDateAfterSeconds = 60 * 60 * 24 * 30; // 30 days + // Configuring $http to act like jQuery.ajax $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; $httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js index cd6a32cb..f10bdf75 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js @@ -120,7 +120,7 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $ }); }; - if ($scope.newFiles.length === 0) { + if (!$scope.newFiles || $scope.newFiles.length === 0) { navigateNext(); } else { $scope.fileIsUploading = true; diff --git a/docs-web/src/main/webapp/src/app/docs/filter/Shorten.js b/docs-web/src/main/webapp/src/app/docs/filter/Shorten.js deleted file mode 100644 index d479cce1..00000000 --- a/docs-web/src/main/webapp/src/app/docs/filter/Shorten.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -/** - * Filter shortening text in one letter uppercase. - */ -angular.module('docs').filter('shorten', function() { - return function(text) { - if (!text) { - return ''; - } - return text.substring(0, 1).toUpperCase(); - } -}); \ No newline at end of file diff --git a/docs-web/src/main/webapp/src/img/sismics.png b/docs-web/src/main/webapp/src/img/sismics.png new file mode 100644 index 00000000..b4b22e20 Binary files /dev/null and b/docs-web/src/main/webapp/src/img/sismics.png differ diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html index 1c4cc18a..f267d780 100644 --- a/docs-web/src/main/webapp/src/index.html +++ b/docs-web/src/main/webapp/src/index.html @@ -41,6 +41,7 @@ + @@ -76,7 +77,6 @@ - @@ -148,5 +148,11 @@