diff --git a/packages/app-shell/src/auth-menu-button.js b/packages/app-shell/src/auth-menu-button.js index a122cb825ba6139db687d2a379e319b1d10c32b4..3bce22047561a8b93e493cb5c2587c0c6a596072 100644 --- a/packages/app-shell/src/auth-menu-button.js +++ b/packages/app-shell/src/auth-menu-button.js @@ -13,7 +13,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { super(); this._i18n = createInstance(); this.lang = this._i18n.language; - this.showImage = false; this.auth = {}; this.closeDropdown = this.closeDropdown.bind(this); @@ -30,7 +29,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { return { ...super.properties, lang: { type: String }, - showImage: { type: Boolean, attribute: 'show-image' }, auth: { type: Object }, }; } @@ -102,12 +100,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { text-decoration: none; } - img { - border-width: var(--dbp-border-width); - border-color: var(--dbp-dark); - border-style: solid; - } - .dropdown.is-active .dropdown-menu, .dropdown.is-hoverable:hover .dropdown-menu { display: block; } @@ -130,10 +122,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { padding-top: 0.5rem; } - .dropdown-content img { - max-width: 120px; - } - .menu a { /*padding: 0.3em;*/ font-weight: 400; @@ -157,7 +145,7 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { position: relative; } - .dropdown, img.login { + .dropdown { cursor: pointer; } @@ -245,9 +233,7 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { renderLoggedIn() { const i18n = this._i18n; - const person = this.auth.person; - const imageURL = (this.showImage && person && person.image) ? person.image : null; - + return html` <div class="dropdown" @click="${this.onDropdownClick}"> <a href="#"> @@ -258,7 +244,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { </a> <div class="dropdown-menu" id="dropdown-menu2" role="menu"> <div class="dropdown-content" @blur="${this.closeDropdown}"> - ${imageURL ? html`<div class="dropdown-item"><img alt="" src="${imageURL}"></div>` : ''} <div class="menu"> <a href="#" @click="${this.onLogoutClicked}" class="dropdown-item">${i18n.t('logout')}</a> </div> diff --git a/packages/auth/src/dbp-auth-demo.js b/packages/auth/src/dbp-auth-demo.js index c4f9a8725e390b92fbe11d09ac5e88112c52e341..cbe643280fdccfac2704dc89d8456ea317565cd3 100644 --- a/packages/auth/src/dbp-auth-demo.js +++ b/packages/auth/src/dbp-auth-demo.js @@ -80,12 +80,12 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js index f029893fcf9e5d718c01ed1c3a982e5ed39b2721..8e2a889b10a62e3bee3e6c0efec2709701825d6d 100644 --- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js +++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js @@ -51,12 +51,12 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/data-table-view/src/dbp-data-table-view-demo.js b/packages/data-table-view/src/dbp-data-table-view-demo.js index 829afe650e8928d9962d3c90edabb885a5a615d5..5c2056b0cd386c60628d6f34f48eaeb131df5e22 100644 --- a/packages/data-table-view/src/dbp-data-table-view-demo.js +++ b/packages/data-table-view/src/dbp-data-table-view-demo.js @@ -140,12 +140,12 @@ export class DataTableViewDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js index d66957f7eb9c6b0fbb35ce4df1c93b0563be2ee4..109bd9a73f2b6aaba61e2e516685435dfabb7e3b 100644 --- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js +++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js @@ -68,12 +68,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/matomo/src/dbp-matomo-demo.js b/packages/matomo/src/dbp-matomo-demo.js index 4184912f95a4a931291ec64ca7a683c407f0343c..bfb9c08d38b091a4bfcde89715c3226c268b1a3f 100644 --- a/packages/matomo/src/dbp-matomo-demo.js +++ b/packages/matomo/src/dbp-matomo-demo.js @@ -72,12 +72,12 @@ export class MatomoDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/organization-select/src/dbp-organization-select-demo.js b/packages/organization-select/src/dbp-organization-select-demo.js index 4d3a047cd7cdffdc8e640cd1bd49e8e2d16482ad..45b8b547d7bcd51c5c6464c9a362673b9197da21 100644 --- a/packages/organization-select/src/dbp-organization-select-demo.js +++ b/packages/organization-select/src/dbp-organization-select-demo.js @@ -53,12 +53,12 @@ export class OrganizationSelectDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/person-profile/src/dbp-person-profile-demo.js b/packages/person-profile/src/dbp-person-profile-demo.js index 4507fab0cf15e4d65d910fe8521ce04b5e099c31..64aaa9f60c3de87e5a4338bc913c7db5db04d2d4 100644 --- a/packages/person-profile/src/dbp-person-profile-demo.js +++ b/packages/person-profile/src/dbp-person-profile-demo.js @@ -89,12 +89,12 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/person-select/src/dbp-person-select-demo.js b/packages/person-select/src/dbp-person-select-demo.js index e792e7b2e25ce37d7c373d9ce802edbea959bc33..ae4f00abb7c9ab9d90f324c011667b4dcaf18451 100644 --- a/packages/person-select/src/dbp-person-select-demo.js +++ b/packages/person-select/src/dbp-person-select-demo.js @@ -53,12 +53,12 @@ export class PersonSelectDemo extends ScopedElementsMixin(DBPLitElement) { } getAuthComponentHtml() { - return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html` + return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html` <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> </div> `; } diff --git a/packages/provider/src/dbp-provider-demo.js b/packages/provider/src/dbp-provider-demo.js index 0def833c099eca34018423680a2f86376cbf7555..7c1b93063d347a84f6d1634a0afadf44f62bc5ba 100644 --- a/packages/provider/src/dbp-provider-demo.js +++ b/packages/provider/src/dbp-provider-demo.js @@ -76,7 +76,7 @@ class ProviderDemo extends ScopedElementsMixin(DBPLitElement) { </div> <div class="container"> <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> - <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button> + <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button> <dbp-language-select></dbp-language-select> </div> <dbp-provider id="demo"