Merge branch 'master' of gitlab.tugraz.at:VPU/WebComponents/PersonProfile

6a1cb16d · Bekerle, Patrizio · Reiter, Christoph · 3cb63e5e · 6a1cb16d · 6a1cb16d
Commit 6a1cb16d authored 5 years ago by Bekerle, Patrizio Committed by Reiter, Christoph 4 years ago
--- 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>
--- 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"
  }
 }
--- a/packages/person-profile/src/i18n/en/translation.json
+++ b/packages/person-profile/src/i18n/en/translation.json
 {
  "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"
  }
 }
--- 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}">


--- a/packages/person-profile/src/person-profile.js
+++ b/packages/person-profile/src/person-profile.js
-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>

--- a/packages/person-profile/src/utils.js
+++ b/packages/person-profile/src/utils.js
-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;
-};
--- a/common @ c15bde62
+++ b/common @ c15bde62
-Subproject commit d99ddf4deb91f0710d3f2f87ed3157c74dbcb8c6
+Subproject commit c15bde62fbf022d666378e115d24b6c0b0bfad20