diff --git a/package.json b/package.json index 3afea06d..5c7d377f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ortolang-market", - "version": "4.6.0-SNAPSHOT", + "version": "4.6.4", "description": "ORTOLANG Marketplace AngularJS App", "license": "LGPL-3.0", "homepage": "https://www.ortolang.fr", diff --git a/pom.xml b/pom.xml index 18dc091a..4420589a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 market Ortolang Diffusion Marketplace Application - 4.6.1-SNAPSHOT + 4.6.5-SNAPSHOT war http://www.ortolang.fr diff --git a/src/main/webapp/static/app/common/auth/auth-init.js b/src/main/webapp/static/app/common/auth/auth-init.js index a93ac4fd..8602459b 100644 --- a/src/main/webapp/static/app/common/auth/auth-init.js +++ b/src/main/webapp/static/app/common/auth/auth-init.js @@ -44,7 +44,7 @@ angular.element(document).ready(function () { if (keycloakAuth.authenticated) { return window.btoa(keycloakAuth.idTokenParsed.preferred_username) + OrtolangConfig.cacheVersion; } - return OrtolangConfig.cacheVersion; + return window.btoa('anonymous') + OrtolangConfig.cacheVersion; } function login() { diff --git a/src/main/webapp/static/app/common/directives/i18n/browser.fr.js b/src/main/webapp/static/app/common/directives/i18n/browser.fr.js index 92133983..4b92716a 100644 --- a/src/main/webapp/static/app/common/directives/i18n/browser.fr.js +++ b/src/main/webapp/static/app/common/directives/i18n/browser.fr.js @@ -100,10 +100,10 @@ angular.module('ortolangMarketApp') PIDS: 'Identifiants pérennes', STATIC: 'Identifiant pérenne statique', STATIC_HELP: 'L\'identifiant pérenne statique pointera vers cette version du {{::type === "object" ? "fichier" : "dossier"}} {{::name}}.', - STATIC_ITEM_HELP: 'Identifiant pérenne statique (pointera vers cette version de la resource)', + STATIC_ITEM_HELP: 'Identifiant pérenne statique (pointera vers cette version de la ressource)', DYNAMIC: 'Identifiant pérenne dynamique', - DYNAMIC_HELP: 'L\'identifiant pérenne dynamique pointera toujours vers la dernière version du {{::type === "object" ? "fichier" : "dossier"}} {{::name}} si une nouvelle version de la resource est publiée.', - DYNAMIC_ITEM_HELP: 'Identifiant pérenne dynamique (pointera toujours vers la dernière version publiée de la resource)', + DYNAMIC_HELP: 'L\'identifiant pérenne dynamique pointera toujours vers la dernière version du {{::type === "object" ? "fichier" : "dossier"}} {{::name}} si une nouvelle version de la ressource est publiée.', + DYNAMIC_ITEM_HELP: 'Identifiant pérenne dynamique (pointera toujours vers la dernière version publiée de la ressource)', COPY: 'Copier le lien', OTHERS: 'Autres identifiants pérenne' }, diff --git a/src/main/webapp/static/app/common/static-website/i18n/static-website.fr.js b/src/main/webapp/static/app/common/static-website/i18n/static-website.fr.js index 281dc197..33dcac9e 100644 --- a/src/main/webapp/static/app/common/static-website/i18n/static-website.fr.js +++ b/src/main/webapp/static/app/common/static-website/i18n/static-website.fr.js @@ -15,7 +15,7 @@ angular.module('ortolangMarketApp') }, ALL_THE_NEWS: 'Toutes les actualités...', USERS: '{{::profileNumber}} utilisateurs', - WORKSPACES: '{{::workspaceNumber}} resources', + WORKSPACES: '{{::workspaceNumber}} ressources', DATA: '{{::binaryStoreSize | bytes}} de données', LEGAL_NOTICES: { TITLE: 'Mentions Légales', diff --git a/src/main/webapp/static/app/market/corpora.js b/src/main/webapp/static/app/market/corpora.js index 7d2d904c..a29f2b37 100644 --- a/src/main/webapp/static/app/market/corpora.js +++ b/src/main/webapp/static/app/market/corpora.js @@ -22,15 +22,15 @@ angular.module('ortolangMarketApp') var metaRatingPrefix = 'ortolang-workspace-json.latestSnapshot.meta_system-rating-json.'; // Written $scope.searchWrittenCorpora = SearchProvider.make(); - $scope.searchWrittenCorpora.setActiveOrderProp('rank', false); + $scope.searchWrittenCorpora.setActiveOrderProp('rank', true); $scope.paramsWrittenCorpora = '{"'+metaItemPrefix+'title":"", "'+metaItemPrefix+'type": "Corpus", "'+metaItemPrefix+'corporaType.key":"referential:written_corpora", "fields":"'+metaLatestSnapshotPrefix+'key,'+metaRatingPrefix+'score:rank,'+metaRatingPrefix+'esrAccessibility,'+metaItemPrefix+'title,'+metaItemPrefix+'type,'+metaItemPrefix+'image,'+metaItemPrefix+'publicationDate,'+metaWorkspacePrefix+'wskey,'+metaWorkspacePrefix+'wsalias,'+metaWorkspacePrefix+'snapshotName", "'+workspacePrefix+'archive":false, "limit":"15", "orderProp":"rank", "orderDir":"desc"}'; // Speech $scope.searchSpeechCorpora = SearchProvider.make(); - $scope.searchSpeechCorpora.setActiveOrderProp('rank', false); + $scope.searchSpeechCorpora.setActiveOrderProp('rank', true); $scope.paramsSpeechCorpora = '{"'+metaItemPrefix+'title":"", "'+metaItemPrefix+'type": "Corpus", "'+metaItemPrefix+'corporaType.key":"referential:speech_corpora", "fields":"'+metaLatestSnapshotPrefix+'key,'+metaRatingPrefix+'score:rank,'+metaRatingPrefix+'esrAccessibility,'+metaItemPrefix+'title,'+metaItemPrefix+'type,'+metaItemPrefix+'image,'+metaItemPrefix+'publicationDate,'+metaWorkspacePrefix+'wskey,'+metaWorkspacePrefix+'wsalias,'+metaWorkspacePrefix+'snapshotName", "'+workspacePrefix+'archive":false, "limit":"15", "orderProp":"rank", "orderDir":"desc"}'; // Multimodal $scope.searchMultimodalCorpora = SearchProvider.make(); - $scope.searchMultimodalCorpora.setActiveOrderProp('rank', false); + $scope.searchMultimodalCorpora.setActiveOrderProp('rank', true); $scope.paramsMultimodalCorpora = '{"'+metaItemPrefix+'title":"", "'+metaItemPrefix+'type": "Corpus", "'+metaItemPrefix+'corporaType.key":"referential:multimodal_corpora", "fields":"'+metaLatestSnapshotPrefix+'key,'+metaRatingPrefix+'score:rank,'+metaRatingPrefix+'esrAccessibility,'+metaItemPrefix+'title,'+metaItemPrefix+'type,'+metaItemPrefix+'image,'+metaItemPrefix+'publicationDate,'+metaWorkspacePrefix+'wskey,'+metaWorkspacePrefix+'wsalias,'+metaWorkspacePrefix+'snapshotName", "'+workspacePrefix+'archive":false, "limit":"15", "orderProp":"rank", "orderDir":"desc"}'; } diff --git a/src/main/webapp/static/app/market/directives/home-news.html b/src/main/webapp/static/app/market/directives/home-news.html index 9cc78778..8d9cd92b 100644 --- a/src/main/webapp/static/app/market/directives/home-news.html +++ b/src/main/webapp/static/app/market/directives/home-news.html @@ -1,7 +1,7 @@

{{'NEWS' | translate}}

-
+

diff --git a/src/main/webapp/static/app/market/directives/item.js b/src/main/webapp/static/app/market/directives/item.js index a908bea6..6240017c 100644 --- a/src/main/webapp/static/app/market/directives/item.js +++ b/src/main/webapp/static/app/market/directives/item.js @@ -56,6 +56,7 @@ angular.module('ortolangMarketApp') scope.esrAccessibility = scope.entry.esrAccessibility; scope.publicationDate = scope.entry.publicationDate; // scope.producers = scope.entry.producers; + scope.effectiveRank = scope.entry.effectiveRank; } } }; diff --git a/src/main/webapp/static/app/market/directives/items.html b/src/main/webapp/static/app/market/directives/items.html index a350ba1b..44fa20ea 100644 --- a/src/main/webapp/static/app/market/directives/items.html +++ b/src/main/webapp/static/app/market/directives/items.html @@ -3,11 +3,11 @@

{{ti
- +
- +
diff --git a/src/main/webapp/static/app/market/directives/items.js b/src/main/webapp/static/app/market/directives/items.js index 25e21f1c..a23d59c3 100644 --- a/src/main/webapp/static/app/market/directives/items.js +++ b/src/main/webapp/static/app/market/directives/items.js @@ -73,9 +73,11 @@ angular.module('ortolangMarketApp') countWorkspace(param); // scope.search.pack(); - angular.forEach(results.entries, function (result) { - var title = result.title; + angular.forEach(results, function (result) { + var title = result.title, + rank = result.rank; result.effectiveTitle = Helper.getMultilingualValue(title); + result.effectiveRank = rank ? rank : 0; }); scope.search.endProcessing(); diff --git a/src/main/webapp/static/app/market/home.js b/src/main/webapp/static/app/market/home.js index e24949c7..044e0af4 100644 --- a/src/main/webapp/static/app/market/home.js +++ b/src/main/webapp/static/app/market/home.js @@ -41,7 +41,7 @@ angular.module('ortolangMarketApp') function init() { initScopeVariables(); $scope.searchRecents = SearchProvider.make(); - $scope.searchRecents.setActiveOrderProp('rank', false); + $scope.searchRecents.setActiveOrderProp('rank', true); var workspacePrefix = 'ortolang-workspace-json.'; var metaLatestSnapshotPrefix = 'ortolang-workspace-json.latestSnapshot.'; var metaItemPrefix = 'ortolang-workspace-json.latestSnapshot.meta_ortolang-item-json.'; diff --git a/src/main/webapp/static/app/market/services/search-provider.js b/src/main/webapp/static/app/market/services/search-provider.js index cca64513..e69be748 100644 --- a/src/main/webapp/static/app/market/services/search-provider.js +++ b/src/main/webapp/static/app/market/services/search-provider.js @@ -29,11 +29,11 @@ angular.module('ortolangMarketApp').factory('SearchProvider', [ '$filter', 'Sear this.orderProps = { title: {id: 'title', sort: 'effectiveTitle', label: 'MARKET.SORT.TITLE', text: 'MARKET.SORT.TITLE'}, - rank: {id: 'rank', sort: ['rank', '-publicationDate'], label: 'MARKET.SORT.RANK', text: 'MARKET.SORT.RANK'}, + rank: {id: 'rank', sort: ['effectiveRank','publicationDate'], label: 'MARKET.SORT.RANK', text: 'MARKET.SORT.RANK'}, publicationDate: {id: 'publicationDate', sort: 'publicationDate', label: 'MARKET.SORT.PUBLICATION_DATE', text: 'MARKET.SORT.PUBLICATION_DATE'} }; this.activeOrderProp = this.orderProps.rank; - this.orderReverse = false; + this.orderReverse = true; angular.forEach(config, function (value, key) { if (this.hasOwnProperty(key)) { diff --git a/src/main/webapp/static/app/producer/i18n/producer.fr.js b/src/main/webapp/static/app/producer/i18n/producer.fr.js index 3f39193a..ab0c0f59 100644 --- a/src/main/webapp/static/app/producer/i18n/producer.fr.js +++ b/src/main/webapp/static/app/producer/i18n/producer.fr.js @@ -16,6 +16,6 @@ angular.module('ortolangMarketApp') HOMEPAGE: 'Site internet', LIST_OF_RESOURCES: 'Liste des productions du laboratoire', META_DESCRIPTION_PRODUCER: 'Liste des productions de : ', - META_DESCRIPTION_PRODUCERS: 'Liste de tous les laboratoires et organismes producteurs de resources publiées sur ORTOLANG.' + META_DESCRIPTION_PRODUCERS: 'Liste de tous les laboratoires et organismes producteurs de ressources publiées sur ORTOLANG.' } }); diff --git a/src/main/webapp/static/app/styles/less/tree.less b/src/main/webapp/static/app/styles/less/tree.less index fbcbbfb8..ab8fcea3 100644 --- a/src/main/webapp/static/app/styles/less/tree.less +++ b/src/main/webapp/static/app/styles/less/tree.less @@ -53,6 +53,9 @@ .workspace-dashboard-permissions { .legend { margin-bottom: 1.5 * @line-height-computed; + .legend-label { + margin-right: @padding-small-horizontal; + } .tag { display: inline-block; margin-bottom: @padding-base-vertical; diff --git a/src/main/webapp/static/app/workspace/i18n/workspace.en.js b/src/main/webapp/static/app/workspace/i18n/workspace.en.js index bd169990..cccbd4f9 100644 --- a/src/main/webapp/static/app/workspace/i18n/workspace.en.js +++ b/src/main/webapp/static/app/workspace/i18n/workspace.en.js @@ -313,7 +313,7 @@ angular.module('ortolangMarketApp') }, DESCRIPTION_FIELD: { LABEL: 'Description', - PLACEHOLDER: 'Sumary of the particularity' + PLACEHOLDER: 'Summary of the particularity' }, WEBSITE_FIELD: { LABEL: 'Web page', @@ -362,9 +362,10 @@ angular.module('ortolangMarketApp') TITLE: 'Create metadata item' }, PERMISSIONS_EDITOR: { - TITLE: 'Visibility of the workspace content', - SHOW_FILES: 'Show files', - ADVANCED_MODE: 'Advanced edition' + TITLE: 'Visibility of the workspace content after publication', + HELP: '

Here you can set the visibility options of the workspace content:

', + LEGEND: 'Legend:', + SHOW_FILES: 'Show files' }, PERMISSIONS_MODAL: { TITLE: 'Visibility of {{::path}}', diff --git a/src/main/webapp/static/app/workspace/i18n/workspace.fr.js b/src/main/webapp/static/app/workspace/i18n/workspace.fr.js index eca62748..a8ef55c4 100644 --- a/src/main/webapp/static/app/workspace/i18n/workspace.fr.js +++ b/src/main/webapp/static/app/workspace/i18n/workspace.fr.js @@ -84,7 +84,7 @@ angular.module('ortolangMarketApp') BODY: 'Vous allez soumettre l\'espace de travail "{{wsName}}" à publication :', VERSION: 'Version', NEXT_TAG: 'Choisir le numéro de la nouvelle version', - NEXT_TAG_HELP: 'Vous pouvez choisir le numéro de la nouvelle version qui sera publiée. Veuillez noter que si vous choisissez de "remplacer la dernière version publiée" : la dernière version publiée n\'apparaitra plus dans les resources d\'ORTOLANG et sera remplacée par cette nouvelle publication. Les données de la version remplacée seront toutefois conservées.', + NEXT_TAG_HELP: 'Vous pouvez choisir le numéro de la nouvelle version qui sera publiée. Veuillez noter que si vous choisissez de "remplacer la dernière version publiée" : la dernière version publiée n\'apparaitra plus dans les ressources d\'ORTOLANG et sera remplacée par cette nouvelle publication. Les données de la version remplacée seront toutefois conservées.', NEXT_TAG_CUSTOM: 'Saisir manuellement le numéro de la nouvelle version', CONTENT: 'Je reconnais être responsable des contenus que je publie et posséder toutes les autorisations, consentements et droits qui me permettent de publier ces contenus', POLICY: 'Je déclare avoir pris connaissance et accepter sans réserves la charte ORTOLANG', @@ -371,9 +371,10 @@ angular.module('ortolangMarketApp') TITLE: 'Remplir la fiche des métadonnées' }, PERMISSIONS_EDITOR: { - TITLE: 'Visibilité du contenu de l\'espace de travail', - SHOW_FILES: 'Afficher les fichiers', - ADVANCED_MODE: 'Édition avancée' + TITLE: 'Visibilité du contenu de l\'espace de travail après publication', + HELP: '

Vous pouvez régler ici les options de visibilité du contenu de votre espace de travail :

', + LEGEND: 'Légende :', + SHOW_FILES: 'Afficher les fichiers' }, PERMISSIONS_MODAL: { TITLE: 'Visibilité de {{::path}}', @@ -386,7 +387,7 @@ angular.module('ortolangMarketApp') AUTHENTIFIED: 'Utilisateurs connectés', ESR: 'Membres de l\'ESR', RESTRICTED: 'Membres de l\'espace de travail', - HELP: 'Certains éléments contenu dans cette resource peuvent avoir un accès restreint aux :' + HELP: 'Certains éléments contenu dans cette ressource peuvent avoir un accès restreint aux :' }, EVENTS: { CORE: { diff --git a/src/main/webapp/static/app/workspace/workspace-dashboard-permissions.html b/src/main/webapp/static/app/workspace/workspace-dashboard-permissions.html index df5a8057..079d26f4 100644 --- a/src/main/webapp/static/app/workspace/workspace-dashboard-permissions.html +++ b/src/main/webapp/static/app/workspace/workspace-dashboard-permissions.html @@ -2,7 +2,9 @@

+
+ {{'WORKSPACE.ACL.FORALL' | translate}} {{'WORKSPACE.ACL.AUTHENTIFIED' | translate}} {{'WORKSPACE.ACL.ESR' | translate}}