From cfe5690a73ac37d49caa95f56acc2164a592a27b Mon Sep 17 00:00:00 2001 From: bgamard Date: Fri, 3 Nov 2017 14:53:09 +0100 Subject: [PATCH] Closes #142: design cleanup --- docs-web/src/main/webapp/src/app/docs/app.js | 8 +- .../docs/controller/document/DocumentEdit.js | 2 +- .../webapp/src/app/docs/filter/Shorten.js | 13 - docs-web/src/main/webapp/src/img/sismics.png | Bin 0 -> 1287 bytes docs-web/src/main/webapp/src/index.html | 8 +- .../main/webapp/src/lib/angular.timeago.js | 686 ++++++++++++++++++ docs-web/src/main/webapp/src/locale/en.json | 2 +- docs-web/src/main/webapp/src/locale/fr.json | 2 +- .../src/partial/docs/document.default.html | 2 +- .../webapp/src/partial/docs/document.html | 27 +- .../src/partial/docs/document.view.html | 2 +- .../src/main/webapp/src/partial/docs/tag.html | 6 +- docs-web/src/main/webapp/src/style/main.less | 87 ++- 13 files changed, 783 insertions(+), 62 deletions(-) delete mode 100644 docs-web/src/main/webapp/src/app/docs/filter/Shorten.js create mode 100644 docs-web/src/main/webapp/src/img/sismics.png create mode 100644 docs-web/src/main/webapp/src/lib/angular.timeago.js 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 0000000000000000000000000000000000000000..b4b22e20ad6ec935ac6a42a426e0814ae399d4ec GIT binary patch literal 1287 zcmaJ>ZA=?=9KKSa9RsNg#%U`1dnC9lw0AvPN-q@pas?_}$4ZqZn+bQlKlB3k!rfsD zn+c;+z|Bt+T-0Q4O9qJvjt?#|xak}*E}B@39~Kio3`G;eR5B7V8s{CO%n#N}?*1=% zp6B=W5iuI(!Q@BZwLBiKLdKyU3IzI2i-u%nGv3Mv&&#tjweap$1quz>9wL*QJk9z;k}I z*F)p99ENGWV@!cPW3fbPY%t~H(AE~voF#Pu0cs4$3PYkwX8q{4E~)R0YYYY35N*(p zK1eD_cZ0B`K;UuWjuhUAgGQIr)!_Dez4d^=T{wmln2T_@ykrAG;yBoOP(7N$^^ z!%8EXAJsE`P=X-u%8KevoAicZSw_ZOPTVM|0Ho>vhYG?jTGit4VZQ$Zhv5# z`rW)i+bq8f+j3Lg`A1d-uvX0;J$F(*zSz`PXZzxU54=`BoBJ&WUbyiSa(q5ioZOC)%@d)V}|R{A8fn)S15cM8E0w*T}Pv?|u7T(%xs9`SbKUl`EZ}IuaUXeapQ0 z?&{LU%&G4Z^&1uWtuOQI*D89WR`bAob;+HrW0UVUCgvvAs`ivtwOH`Ly}O6O-(j?D u?bSc>tFs3!XRhvPe;WUJ+>}8A<0d5i + @@ -76,7 +77,6 @@ - @@ -148,5 +148,11 @@
+ +
+
+ +
+
\ No newline at end of file diff --git a/docs-web/src/main/webapp/src/lib/angular.timeago.js b/docs-web/src/main/webapp/src/lib/angular.timeago.js new file mode 100644 index 00000000..850f7af1 --- /dev/null +++ b/docs-web/src/main/webapp/src/lib/angular.timeago.js @@ -0,0 +1,686 @@ +/** + * Angular directive/filter/service for formatting date so that it displays how long ago the given time was compared to now. + * @version v0.4.5 - 2017-04-17 + * @link https://github.com/yaru22/angular-timeago + * @author Brian Park + * @license MIT License, http://www.opensource.org/licenses/MIT + */ +'use strict'; + +angular.module('yaru22.angular-timeago', []); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['ca_ES'] = { + prefixAgo: 'fa', + prefixFromNow: 'd\'aquí', + suffixAgo: null, + suffixFromNow: null, + seconds: 'menys d\'un minut', + minute: 'prop d\'un minut', + minutes: '%d minuts', + hour: 'prop d\'una hora', + hours: 'prop de %d hores', + day: 'un dia', + days: '%d dies', + month: 'prop d\'un mes', + months: '%d mesos', + year: 'prop d\'un any', + years: '%d anys', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + + /** + * Czech language uses 2 different versions for future based on the digit being + * lower than 5 or not. + */ + function resolvePastAndFuture(past, future, future5) { + return function(d, millis) { + var isFuture = millis < 0; + + if (!isFuture) { + return past; + } else { + if (d <= 4) { + return future; + } else { + return future5; + } + } + }; + } + + timeAgoSettings.strings['cs_CZ'] = { + prefixAgo: 'prěd', + prefixFromNow: 'za', + suffixAgo: null, + suffixFromNow: null, + + //the below works for past + seconds: resolvePastAndFuture('méně než minutou', 'méne než minutu', 'méne než minutu'), + minute: resolvePastAndFuture('minutou', 'minutu', 'minutu'), + minutes: resolvePastAndFuture('%d minutami', '%d minuty', '%d minút'), + hour: resolvePastAndFuture('hodinou', 'hodinu', 'hodinu'), + hours: resolvePastAndFuture('%d hodinama', '%d hodiny', '%d hodin'), + day: resolvePastAndFuture('dnem', 'den', 'den'), + days: resolvePastAndFuture('%d dny', '%d dny', '%d dnů'), + month: resolvePastAndFuture('měsícem', 'měsíc', 'měsíc'), + months: resolvePastAndFuture('%d měsíci', '%d měsíce', '%d měsíců'), + year: resolvePastAndFuture('rokem', 'rok', 'rok'), + years: resolvePastAndFuture('%d lety', '%d roky', '%d let'), + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['da_DK'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'siden', + suffixFromNow: null, + seconds: 'mindre end et minut', + minute: 'omkring et minut', + minutes: '%d minuter', + hour: 'omkring en time', + hours: 'omkring %d timer', + day: 'en dag', + days: '%d dage', + month: 'omkring en m\xe5ned', + months: '%d m\xe5neder', + year: 'omkring et \xe5r', + years: '%d \xe5r', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['de_DE'] = { + prefixAgo: 'vor', + prefixFromNow: 'in', + suffixAgo: null, + suffixFromNow: null, + seconds: 'weniger als einer Minute', + minute: 'ca. einer Minute', + minutes: '%d Minuten', + hour: 'ca. einer Stunde', + hours: 'ca. %d Stunden', + day: 'einem Tag', + days: '%d Tagen', + month: 'ca. einem Monat', + months: '%d Monaten', + year: 'ca. einem Jahr', + years: '%d Jahren', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['en_US'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'ago', + suffixFromNow: 'from now', + seconds: 'less than a minute', + minute: 'about a minute', + minutes: '%d minutes', + hour: 'about an hour', + hours: 'about %d hours', + day: 'a day', + days: '%d days', + month: 'about a month', + months: '%d months', + year: 'about a year', + years: '%d years', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['es_ES'] = { + prefixAgo: 'hace', + prefixFromNow: 'dentro de', + suffixAgo: null, + suffixFromNow: null, + seconds: 'menos de un minuto', + minute: 'un minuto', + minutes: '%d minutos', + hour: 'una hora', + hours: '%d horas', + day: 'un día', + days: '%d días', + month: 'un mes', + months: '%d meses', + year: 'un año', + years: '%d años', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['es_LA'] = { + prefixAgo: 'hace', + prefixFromNow: 'en', + suffixAgo: null, + suffixFromNow: null, + seconds: 'menos de un minuto', + minute: 'un minuto', + minutes: '%d minutos', + hour: 'una hora', + hours: '%d horas', + day: 'un día', + days: '%d días', + month: 'un mes', + months: '%d meses', + year: 'un año', + years: '%d años', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['fr_FR'] = { + prefixAgo: 'il y a', + prefixFromNow: 'dans', + suffixAgo: null, + suffixFromNow: null, + seconds: 'moins d\'une minute', + minute: 'environ une minute', + minutes: '%d minutes', + hour: 'environ une heure', + hours: 'environ %d heures', + day: 'un jour', + days: '%d jours', + month: 'environ un mois', + months: '%d mois', + year: 'environ un an', + years: '%d ans', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['he_IL'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'לפני', + suffixFromNow: 'מעכשיו', + seconds: 'פחות מדקה', + minute: 'כדקה', + minutes: '%d דקות', + hour: 'כשעה', + hours: 'כ %d שעות', + day: 'יום', + days: '%d ימים', + month: 'כחודש', + months: '%d חודשים', + year: 'כשנה', + years: '%d שנים', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['hu_HU'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: null, + suffixFromNow: null, + seconds: 'kevesebb mint egy perce', + minute: 'körülbelül egy perce', + minutes: '%d perce', + hour: 'körülbelül egy órája', + hours: 'körülbelül %d órája', + day: 'egy napja', + days: '%d napja', + month: 'körülbelül egy hónapja', + months: '%d hónapja', + year: 'körülbelül egy éve', + years: '%d éve', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['it_IT'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'fa', + suffixFromNow: 'da ora', + seconds: 'meno di un minuto', + minute: 'circa un minuto', + minutes: '%d minuti', + hour: 'circa un\' ora', + hours: 'circa %d ore', + day: 'un giorno', + days: '%d giorni', + month: 'circa un mese', + months: '%d mesi', + year: 'circa un anno', + years: '%d anni', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['nl_NL'] = { + prefixAgo: null, + prefixFromNow: 'over', + suffixAgo: 'geleden', + suffixFromNow: 'vanaf nu', + seconds: 'een paar seconden', + minute: 'ongeveer een minuut', + minutes: '%d minuten', + hour: 'een uur', + hours: '%d uur', + day: 'een dag', + days: '%d dagen', + month: 'een maand', + months: '%d maanden', + year: 'een jaar', + years: '%d jaar', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['pl_PL'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'temu', + suffixFromNow: 'od teraz', + seconds: 'mniej niż minuta', + minute: 'około minuty', + minutes: '%d minut', + hour: 'około godziny', + hours: 'około %d godzin', + day: 'dzień', + days: '%d dni', + month: 'około miesiąca', + months: '%d miesięcy', + year: 'około roku', + years: '%d lat', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['pt_BR'] = { + prefixAgo: null, + prefixFromNow: 'daqui a', + suffixAgo: 'atrás', + suffixFromNow: null, + seconds: 'menos de um minuto', + minute: 'cerca de um minuto', + minutes: '%d minutos', + hour: 'cerca de uma hora', + hours: 'cerca de %d horas', + day: 'um dia', + days: '%d dias', + month: 'cerca de um mês', + months: '%d meses', + year: 'cerca de um ano', + years: '%d anos', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['ru_RU'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'назад', + suffixFromNow: 'с текущего момента', + seconds: 'менее минуты', + minute: 'около минуты', + minutes: '%d мин.', + hour: 'около часа', + hours: 'около %d ч.', + day: 'день', + days: '%d дн.', + month: 'около месяца', + months: '%d мес.', + year: 'около года', + years: '%d года', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['ru_RU'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'назад', + suffixFromNow: null, + seconds: 'меньше минуты', + minute: 'около минуты', + minutes: '%d мин.', + hour: 'около часа', + hours: 'около %d час.', + day: 'день', + days: '%d дн.', + month: 'около месяца', + months: '%d мес.', + year: 'около года', + years: '%d г.', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['sv_SE'] = { + prefixAgo: null, + prefixFromNow: 'om', + suffixAgo: 'sen', + suffixFromNow: null, + seconds: 'mindre än en minut', + minute: 'cirka en minut', + minutes: '%d minuter', + hour: 'cirka en timme', + hours: 'cirka %d timmar', + day: 'en dag', + days: '%d dagar', + month: 'cirka en månad', + months: '%d månader', + year: 'cirka ett år', + years: '%d år', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['tr_TR'] = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: 'önce', + suffixFromNow: 'şu andan itibaren', + seconds: 'bir dakikadan daha az', + minute: 'bir dakika gibi', + minutes: '%d dakika', + hour: 'bir saat gibi', + hours: '%d saat gibi', + day: 'bir gün', + days: '%d gün', + month: 'bir ay gibi', + months: '%d ay', + year: 'bir yıl gibi', + years: '%d yıl', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['zh_CN'] = { + wordSeparator: '', + prefixAgo: null, + prefixFromNow: null, + suffixAgo: '前', + suffixFromNow: '后', + seconds: '1分钟', + minute: '1分钟', + minutes: '%d分钟', + hour: '1小时', + hours: '%d小时', + day: '1天', + days: '%d天', + month: '1个月', + months: '%d个月', + year: '1年', + years: '%d年', + numbers: [] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').config(["timeAgoSettings", function(timeAgoSettings) { + timeAgoSettings.strings['zh_TW'] = { + wordSeparator: '', + prefixAgo: null, + prefixFromNow: null, + suffixAgo: '前', + suffixFromNow: '後', + seconds: '少於一分鐘', + minute: '一分鐘', + minutes: '%d分鐘', + hour: '一小時', + hours: '%d小時', + day: '一日', + days: '%d日', + month: '一個月', + months: '%d個月', + year: '一年', + years: '%d年', + numbers: [ + '零', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十', + '十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十', + '廿一', '廿二', '廿三', '廿四', '廿五', '廿六', '廿七', '廿八', '廿九', '三十', + '卅一', '卅二', '卅三', '卅四', '卅五', '卅六', '卅七', '卅八', '卅九', '四十', + '卌一', '卌二', '卌三', '卌四', '卌五', '卌六', '卌七', '卌八', '卌九', '五十', + '五十一', '五十二', '五十三', '五十四', '五十五', '五十六', '五十七', '五十八', '五十九', '六十', + '六十一', '六十二', '六十三', '六十四', '六十五', '六十六', '六十七', '六十八', '六十九', '七十', + '七十一', '七十二', '七十三', '七十四', '七十五', '七十六', '七十七', '七十八', '七十九', '八十', + '八十一', '八十二', '八十三', '八十四', '八十五', '八十六', '八十七', '八十八', '八十九', '九十', + '九十一', '九十二', '九十三', '九十四', '九十五', '九十六', '九十七', '九十八', '九十九', '一百', + ] + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').factory('nowTime', ["$interval", "timeAgo", "timeAgoSettings", function($interval, timeAgo, timeAgoSettings) { + var nowTime; + + function updateTime() { + nowTime = Date.now(); + } + updateTime(); + $interval(updateTime, timeAgoSettings.refreshMillis); + + return function() { + return nowTime; + }; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').constant('timeAgoSettings', { + refreshMillis: 1000, + allowFuture: false, + overrideLang: null, + fullDateAfterSeconds: null, + strings: {}, + breakpoints: { + secondsToMinute: 45, // in seconds + secondsToMinutes: 90, // in seconds + minutesToHour: 45, // in minutes + minutesToHours: 90, // in minutes + hoursToDay: 24, // in hours + hoursToDays: 42, // in hours + daysToMonth: 30, // in days + daysToMonths: 45, // in days + daysToYear: 365, // in days + yearToYears: 1.5 // in year + } +}); + +'use strict'; + +angular.module('yaru22.angular-timeago').directive('timeAgo', ["timeAgo", "nowTime", function(timeAgo, nowTime) { + return { + scope: { + fromTime: '@', + format: '@' + }, + restrict: 'EA', + link: function(scope, elem) { + var fromTime; + + // Track changes to fromTime + scope.$watch('fromTime', function() { + fromTime = timeAgo.parse(scope.fromTime); + }); + + // Track changes to time difference + scope.$watch(function() { + return nowTime() - fromTime; + }, function(value) { + angular.element(elem).text(timeAgo.inWords(value, fromTime, scope.format)); + }); + } + }; +}]); + +'use strict'; +/*global moment */ + +angular.module('yaru22.angular-timeago').factory('timeAgo', ["$filter", "timeAgoSettings", function($filter, timeAgoSettings) { + var service = {}; + + service.inWords = function(distanceMillis, fromTime, format, timezone) { + + var fullDateAfterSeconds = parseInt(timeAgoSettings.fullDateAfterSeconds, 10); + + if (!isNaN(fullDateAfterSeconds)) { + var fullDateAfterMillis = fullDateAfterSeconds * 1000; + if ((distanceMillis >= 0 && fullDateAfterMillis <= distanceMillis) || + (distanceMillis < 0 && fullDateAfterMillis >= distanceMillis)) { + if (format) { + return $filter('date')(fromTime, format, timezone); + } + return fromTime; + } + } + + var overrideLang = timeAgoSettings.overrideLang; + var documentLang = document.documentElement.lang; + var sstrings = timeAgoSettings.strings; + var lang, $l; + + if (typeof sstrings[overrideLang] !== 'undefined') { + lang = overrideLang; + $l = sstrings[overrideLang]; + } else if (typeof sstrings[documentLang] !== 'undefined') { + lang = documentLang; + $l = sstrings[documentLang]; + } else { + lang = 'en_US'; + $l = sstrings[lang]; + } + + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (timeAgoSettings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + number = Math.round(number); + var string = angular.isFunction(stringOrFunction) ? + stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var breakpoints = timeAgoSettings.breakpoints; + var words = seconds < breakpoints.secondsToMinute && substitute($l.seconds, seconds) || + seconds < breakpoints.secondsToMinutes && substitute($l.minute, 1) || + minutes < breakpoints.minutesToHour && substitute($l.minutes, minutes) || + minutes < breakpoints.minutesToHours && substitute($l.hour, 1) || + hours < breakpoints.hoursToDay && substitute($l.hours, hours) || + hours < breakpoints.hoursToDays && substitute($l.day, 1) || + days < breakpoints.daysToMonth && substitute($l.days, days) || + days < breakpoints.daysToMonths && substitute($l.month, 1) || + days < breakpoints.daysToYear && substitute($l.months, days / 30) || + years < breakpoints.yearToYears && substitute($l.year, 1) || + substitute($l.years, years); + + var separator = $l.wordSeparator === undefined ? ' ' : $l.wordSeparator; + if (lang === 'he_IL') { + return [prefix, suffix, words].join(separator).trim(); + } else { + return [prefix, words, suffix].join(separator).trim(); + } + }; + + service.parse = function(input) { + if (input instanceof Date) { + return input; + } else if ((typeof moment !== 'undefined') && moment.isMoment(input)) { + return input.toDate(); + } else if (angular.isNumber(input)) { + return new Date(input); + } else if (/^\d+$/.test(input)) { + return new Date(parseInt(input, 10)); + } else { + var s = (input || '').trim(); + s = s.replace(/\.\d+/, ''); // remove milliseconds + s = s.replace(/-/, '/').replace(/-/, '/'); + s = s.replace(/T/, ' ').replace(/Z/, ' UTC'); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/, ' $1$2'); // -04:00 -> -0400 + return new Date(s); + } + }; + + return service; +}]); + +'use strict'; + +angular.module('yaru22.angular-timeago').filter('timeAgo', ["nowTime", "timeAgo", function(nowTime, timeAgo) { + function timeAgoFilter(value, format, timezone) { + var fromTime = timeAgo.parse(value); + var diff = nowTime() - fromTime; + return timeAgo.inWords(diff, fromTime, format, timezone); + } + timeAgoFilter.$stateful = true; + return timeAgoFilter; +}]); \ No newline at end of file diff --git a/docs-web/src/main/webapp/src/locale/en.json b/docs-web/src/main/webapp/src/locale/en.json index fe6ecf93..26334eca 100644 --- a/docs-web/src/main/webapp/src/locale/en.json +++ b/docs-web/src/main/webapp/src/locale/en.json @@ -46,7 +46,7 @@ "page_size": "Page size", "page_size_10": "10 per page", "page_size_20": "20 per page", - "page_size_30": "20 per page", + "page_size_30": "30 per page", "upgrade_quota": "To upgrade your quota, ask your administrator", "quota": "{{ current | number: 0 }}MB ({{ percent | number: 1 }}%) used on {{ total | number: 0 }}MB", "count": "{{ count }} document{{ count > 1 ? 's' : '' }} found", diff --git a/docs-web/src/main/webapp/src/locale/fr.json b/docs-web/src/main/webapp/src/locale/fr.json index 0792f629..16a624e1 100644 --- a/docs-web/src/main/webapp/src/locale/fr.json +++ b/docs-web/src/main/webapp/src/locale/fr.json @@ -46,7 +46,7 @@ "page_size": "Taille de page", "page_size_10": "10 par page", "page_size_20": "20 par page", - "page_size_30": "20 par page", + "page_size_30": "30 par page", "upgrade_quota": "Pour augmenter votre quota, veuillez contacter votre administrateur", "quota": "{{ current | number: 0 }}Mo ({{ percent | number: 1 }}%) utilisé sur {{ total | number: 0 }}MB", "count": "{{ count }} document{{ count > 1 ? 's' : '' }} trouvé{{ count > 1 ? 's' : '' }}", diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html index 3d7be06f..0854d273 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.default.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html @@ -1,7 +1,7 @@
-
+

{{ 'document.default.quick_upload' | translate }}

diff --git a/docs-web/src/main/webapp/src/partial/docs/document.html b/docs-web/src/main/webapp/src/partial/docs/document.html index f102a0e2..a84c00e4 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.html @@ -1,6 +1,6 @@ -
+
-
+

{{ 'document.add_document' | translate }}

@@ -42,35 +42,34 @@ {{ 'document.title' | translate }} {{ 'document.creation_date' | translate }} - {{ 'document.tags' | translate }} - + - + {{ 'document.no_documents' | translate }} - + {{ document.title }} ({{ document.file_count }}) - - {{ document.create_date | date: 'yyyy-MM-dd' }} - -
- - {{ tag.name | shorten }}{{ tag.name }} - + +
{{ document.create_date | timeAgo: 'yyyy-MM-dd' }}
+ +
+ + {{ tag.name }} +
@@ -100,7 +99,7 @@
-
+
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html index 7e015bde..6af82ba9 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html @@ -86,7 +86,7 @@
-

+

{{ 'document.view.comments' | translate }}

diff --git a/docs-web/src/main/webapp/src/partial/docs/tag.html b/docs-web/src/main/webapp/src/partial/docs/tag.html index 51f95da4..8dc9d243 100644 --- a/docs-web/src/main/webapp/src/partial/docs/tag.html +++ b/docs-web/src/main/webapp/src/partial/docs/tag.html @@ -1,6 +1,6 @@ -
+
-
+

  @@ -35,7 +35,7 @@

-
+
\ No newline at end of file diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less index 93b88f39..0bdfd8a5 100644 --- a/docs-web/src/main/webapp/src/style/main.less +++ b/docs-web/src/main/webapp/src/style/main.less @@ -41,37 +41,51 @@ tbody tr { cursor: pointer; - } - - .cell-tags { - padding: 2px; - - .label { - margin-left: 2px; - - .full { - display: none; - } - } - - &:hover { - .tags { - position: absolute; + td { .label { - .full { - display: inline; - } - - .shorten { - display: none; - } + margin-left: 5px; } } - } } } +@media (min-width: 992px) { + .row-full { + overflow: hidden; + margin-top: -20px !important; + } + + .well-full { + margin-left: -15px; + padding-bottom: 1000px; + margin-bottom: -980px; + height: 100%; + background-color: #f5f5f5; + box-shadow: inset -2px 0 0 #e5e5e5; + } + + .col-full { + margin-top: 20px; + } +} + +// Footer +.footer { + border-top: 1px #e1e4e8 solid; + padding: 20px; + + img { + opacity: 0.1; + } +} + +// Drop zone +.drop-zone { + background: none; + border: 2px dashed #eee; +} + // $http loader .loader { position: relative; @@ -199,6 +213,11 @@ input[readonly].share-link { color: #b94a48 !important; } +// Comments +.page-header-comments { + margin: 14px 0 20px; +} + // Dirty Bootstrap 3 fix, see https://github.com/twbs/bootstrap/issues/6686 .row { margin: 0; padding: 0 } .navbar-nav.navbar-right:last-child { @@ -308,4 +327,24 @@ input[readonly].share-link { left: 0; right: 0; z-index: 99999; +} + +// Heart +.glyphicon-heart { + &:hover { + color: #e74c3c; + animation: pulse 1s linear infinite; + } +} + +@keyframes pulse{ + 0% { + transform:scale(1.1); + } + 50%{ + transform:scale(0.8); + } + 100%{ + transform:scale(1.1); + } } \ No newline at end of file