sh-edraft.de/sh_discord_bot
2
1
Fork 1
Code Issues 26 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Merge branch '1.0.1' into #274

Browse Source
This commit is contained in:
Sven Heidemann
2023-03-28 18:24:21 +02:00
parent 27a4c140e4 7ba0247519
commit 0003255d7c
10 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdb-web/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "kdb-web",
"version": "1.0.0",
"version": "1.1.0",
"scripts": {
"ng": "ng",
"update-version": "ts-node-esm update-version.ts",

2
kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html
View File

@@ -160,7 +160,7 @@
<td>
<div class="btn-wrapper">
<app-history-btn [history]="autoRoleRule.history" translationKey="view.server.auto_roles.rules.header"></app-history-btn>
<app-history-btn *ngIf="!isEditingNew" [history] ="autoRoleRule.history" translationKey="view.server.auto_roles.rules.header"></app-history-btn>
<button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil" (click)="onRowEditInit(dt, autoRoleRule, ri)"></button>
<button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
(click)="deleteAutoRoleRule(autoRoleRule)"></button>

2
kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html
View File

@@ -193,7 +193,7 @@
<div class="btn-wrapper">
<!-- <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"-->
<!-- (click)="onRowEditInit(dt, autoRole, ri)"></button>-->
<app-history-btn [history]="autoRole.history" translationKey="view.server.auto_roles.header"></app-history-btn>
<app-history-btn *ngIf="!isEditingNew" [history] ="autoRole.history" translationKey="view.server.auto_roles.header"></app-history-btn>
<button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-sliders-h" [routerLink]="[autoRole.id, 'rules']"></button>
<button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
(click)="deleteAutoRole(autoRole)"></button>

4
kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html
View File

@@ -18,7 +18,7 @@
<div class="table-caption-btn-wrapper btn-wrapper">
<button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew">
icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew || user?.isModerator && !user?.isAdmin">
</button>
<button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
class="icon-btn btn" (click)="resetFilters()">
@@ -184,7 +184,7 @@
</td>
<td>
<div class="btn-wrapper">
<app-history-btn [history]="level.history" translationKey="view.server.levels.header"></app-history-btn>
<app-history-btn *ngIf="!isEditingNew" [history] ="level.history" translationKey="view.server.levels.header"></app-history-btn>
<button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
(click)="onRowEditInit(dt, level, ri)" [disabled]="!user || user.isModerator && !user.isAdmin"></button>
<button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"

2
kdb-web/src/app/modules/view/server/members/members.component.html
View File

@@ -224,7 +224,7 @@
</td>
<td>
<div class="btn-wrapper">
<app-history-btn [history]="member.history" translationKey="view.server.members.header"></app-history-btn>
<app-history-btn *ngIf="!isEditingNew" [history] ="member.history" translationKey="view.server.members.header"></app-history-btn>
<button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
(click)="onRowEditInit(dt, member, ri)"></button>
<button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-user"

2
kdb-web/src/assets/config.json
View File

@@ -4,7 +4,7 @@
"ImprintURL": "https://www.sh-edraft.de/Impressum",
"WebVersion": {
"Major": "1",
"Minor": "0",
"Minor": "1",
"Micro": "0"
},
"Themes": [

4
kdb-web/src/styles/themes/default-dark-theme.scss
View File

@@ -353,6 +353,10 @@
color: $primaryTextColor;
}
.p-dropdown-panel .p-dropdown-items .p-dropdown-item {
color: $primaryTextColor !important;
}
.p-dropdown-panel {
background-color: $secondaryBackgroundColor !important;

4
kdb-web/src/styles/themes/default-light-theme.scss
View File

@@ -353,6 +353,10 @@
color: $primaryTextColor;
}
.p-dropdown-panel .p-dropdown-items .p-dropdown-item {
color: $primaryTextColor !important;
}
.p-dropdown-panel {
background-color: $primaryBackgroundColor !important;

4
kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
View File

@@ -357,6 +357,10 @@
color: $primaryTextColor;
}
.p-dropdown-panel .p-dropdown-items .p-dropdown-item {
color: $primaryTextColor !important;
}
.p-dropdown-panel {
background-color: $secondaryBackgroundColor !important;

4
kdb-web/src/styles/themes/sh-edraft-light-theme.scss
View File

@@ -353,6 +353,10 @@
color: $primaryTextColor;
}
.p-dropdown-panel .p-dropdown-items .p-dropdown-item {
color: $primaryTextColor !important;
}
.p-dropdown-panel {
background-color: $primaryBackgroundColor !important;