From 6a1cb16df9f64f67887c75d5ca767f224cb9cbce Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio.bekerle@tugraz.at>
Date: Wed, 25 Sep 2019 14:04:58 +0200
Subject: [PATCH] Merge branch 'master' of
gitlab.tugraz.at:VPU/WebComponents/PersonProfile
---
packages/person-profile/assets/index.html | 2 +-
.../person-profile/src/i18n/de/translation.json | 3 ++-
.../person-profile/src/i18n/en/translation.json | 13 +++++++------
packages/person-profile/src/person-profile-demo.js | 4 ++--
packages/person-profile/src/person-profile.js | 7 ++++---
packages/person-profile/src/utils.js | 9 ---------
packages/person-profile/vendor/common | 2 +-
7 files changed, 17 insertions(+), 23 deletions(-)
delete mode 100644 packages/person-profile/src/utils.js
diff --git a/packages/person-profile/assets/index.html b/packages/person-profile/assets/index.html
index 20f669bb..20337958 100644
--- a/packages/person-profile/assets/index.html
+++ b/packages/person-profile/assets/index.html
@@ -7,6 +7,6 @@
<body>
-<vpu-person-profile-demo lang="de"></vpu-person-profile-demo>
+<vpu-person-profile-demo id="vpu-person-profile-src" lang="de"></vpu-person-profile-demo>
</body>
</html>
diff --git a/packages/person-profile/src/i18n/de/translation.json b/packages/person-profile/src/i18n/de/translation.json
index a9b63f13..e468f012 100644
--- a/packages/person-profile/src/i18n/de/translation.json
+++ b/packages/person-profile/src/i18n/de/translation.json
@@ -8,6 +8,7 @@
"role": "Rolle",
"none-selected": "Keine Person ausgewählt",
"staff": "Mitarbeiter/in",
- "alumni": "Absolvent/in"
+ "alumni": "Absolvent/in",
+ "unknown": "unbekannt"
}
}
diff --git a/packages/person-profile/src/i18n/en/translation.json b/packages/person-profile/src/i18n/en/translation.json
index 712a774f..b4cc34a2 100644
--- a/packages/person-profile/src/i18n/en/translation.json
+++ b/packages/person-profile/src/i18n/en/translation.json
@@ -1,13 +1,14 @@
{
"person-profile": {
"profile-caption": "Profile for",
- "given-name": "given name",
- "family-name": "family name",
- "email": "email",
- "telephone": "telephone",
- "role": "role",
+ "given-name": "Given name",
+ "family-name": "Family name",
+ "email": "Email",
+ "telephone": "Telephone",
+ "role": "Role",
"none-selected": "No person selected",
"staff": "staff",
- "alumni": "alumni"
+ "alumni": "alumni",
+ "unknown": "unknown"
}
}
diff --git a/packages/person-profile/src/person-profile-demo.js b/packages/person-profile/src/person-profile-demo.js
index 45ad1642..b491e6f9 100644
--- a/packages/person-profile/src/person-profile-demo.js
+++ b/packages/person-profile/src/person-profile-demo.js
@@ -4,7 +4,6 @@ import VPULitElement from 'vpu-common/vpu-lit-element';
import './person-profile.js';
import * as commonUtils from 'vpu-common/utils';
import bulmaCSSPath from "bulma/css/bulma.min.css";
-import {getAssetURL} from "./utils";
import $ from 'jquery';
import 'vpu-person-select';
@@ -63,7 +62,8 @@ class PersonProfileDemo extends VPULitElement {
}
render() {
- const bulmaCSS = getAssetURL(bulmaCSSPath);
+ commonUtils.initAssetBaseURL('vpu-person-profile-src');
+ const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
return html`
<link rel="stylesheet" href="${bulmaCSS}">
diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js
index a23a1a06..4b8ff46e 100644
--- a/packages/person-profile/src/person-profile.js
+++ b/packages/person-profile/src/person-profile.js
@@ -1,4 +1,4 @@
-import {getAssetURL} from './utils.js';
+
import JSONLD from 'vpu-common/jsonld';
import {html} from 'lit-element';
import {i18n} from './i18n.js';
@@ -71,7 +71,7 @@ class PersonProfile extends VPULitElement {
}
render() {
- let role = 'unbekannt';
+ let role = i18n.t('person-profile.unknown');
if (this.person !== null && this.person.roles !== undefined) {
// roles are only defined for self-disclosure
if (this.person.roles.indexOf('ROLE_STAFF') > -1) {
@@ -80,7 +80,8 @@ class PersonProfile extends VPULitElement {
role = i18n.t('person-profile.alumni');
}
}
- const bulmaCSS = getAssetURL(bulmaCSSPath);
+ commonUtils.initAssetBaseURL('vpu-person-profile-src');
+ const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
return html`
<link rel="stylesheet" href="${bulmaCSS}">
<style>
diff --git a/packages/person-profile/src/utils.js b/packages/person-profile/src/utils.js
deleted file mode 100644
index ce1da2b8..00000000
--- a/packages/person-profile/src/utils.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const getAssetURL = (path) => {
- const elm = document.getElementById('vpu-library-shelving-wc-src');
- if (!elm)
- return path;
- const url = elm.src;
- // newer browsers only
- //var url = import.meta.url;
- return new URL(path, url).href;
-};
diff --git a/packages/person-profile/vendor/common b/packages/person-profile/vendor/common
index d99ddf4d..c15bde62 160000
--- a/packages/person-profile/vendor/common
+++ b/packages/person-profile/vendor/common
@@ -1 +1 @@
-Subproject commit d99ddf4deb91f0710d3f2f87ed3157c74dbcb8c6
+Subproject commit c15bde62fbf022d666378e115d24b6c0b0bfad20
--
GitLab