diff --git a/src/components/GrampsjsSysinfo.js b/src/components/GrampsjsSysinfo.js index 0ec166d9..4530b350 100644 --- a/src/components/GrampsjsSysinfo.js +++ b/src/components/GrampsjsSysinfo.js @@ -31,18 +31,20 @@ export class GrampsjsSysinfo extends GrampsjsTranslateMixin(LitElement) { static get properties() { return { data: {type: Object}, + tree: {type: String}, } } constructor() { super() this.data = {} + this.tree = '' } render() { const version = '[VI]{version}[/VI]' return html` -
+
${this._('Copy to clipboard')} - Gramps ${this.data?.gramps?.version || '?'}
- Gramps Web API ${this.data?.gramps_webapi?.version || '?'}
- Gramps Web Frontend ${version}
- Gramps QL ${this.data?.gramps_ql?.version || '?'}
- Sifts ${this.data?.search?.sifts?.version || '?'}
- locale: ${this.data?.locale?.language}
- multi-tree: ${this.data?.server?.multi_tree}
- task queue: ${this.data?.server?.task_queue}
- OCR: ${this.data?.server?.ocr}
- chat: ${this.data?.server?.chat}
+ + Gramps ${this.data?.gramps?.version || '?'}
+ Gramps Web API ${this.data?.gramps_webapi?.version || '?'}
+ Gramps Web Frontend ${version}
+ Gramps QL ${this.data?.gramps_ql?.version || '?'}
+ Sifts ${this.data?.search?.sifts?.version || '?'}
+ locale: ${this.data?.locale?.language}
+ multi-tree: ${this.data?.server?.multi_tree}
+ task queue: ${this.data?.server?.task_queue}
+ OCR: ${this.data?.server?.ocr}
+ chat: ${this.data?.server?.chat}
+
+
+
Tree: ${this.tree}
` } diff --git a/src/views/GrampsjsViewSettings.js b/src/views/GrampsjsViewSettings.js index 2bf28d76..b2bbd03f 100644 --- a/src/views/GrampsjsViewSettings.js +++ b/src/views/GrampsjsViewSettings.js @@ -3,6 +3,7 @@ import {css, html} from 'lit' import {GrampsjsViewSettingsOnboarding} from './GrampsjsViewSettingsOnboarding.js' import './GrampsjsViewAdminSettings.js' import './GrampsjsViewUserManagement.js' +import {userRoles} from '../components/GrampsjsFormUser.js' import '../components/GrampsjsUsers.js' import '../components/GrampsjsTaskProgressIndicator.js' import '../components/GrampsjsShareUrl.js' @@ -136,6 +137,10 @@ export class GrampsjsViewSettings extends GrampsjsViewSettingsOnboarding { renderUserSettings() { return html` +

+ ${this._('Username: ')} ${this._userInfo?.name} ${this._('Role')}: + ${this._(userRoles[this._userInfo?.role])} +

${renderLogoutButton()}

${this._('Select language')}

@@ -163,6 +168,8 @@ export class GrampsjsViewSettings extends GrampsjsViewSettingsOnboarding { ` }