+
visibility
{{ item.verboseType | translate }}
diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
index 7d1ee94b9..68df26fa7 100644
--- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
+++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
@@ -33,12 +33,12 @@ export class AgendaListComponent extends ListViewBaseComponent
i
/**
* Determine the display columns in desktop view
*/
- public displayedColumnsDesktop: string[] = ['title', 'info', 'speakers', 'menu'];
+ public displayedColumnsDesktop: string[] = ['title', 'info', 'speakers'];
/**
* Determine the display columns in mobile view
*/
- public displayedColumnsMobile: string[] = ['title', 'speakers', 'menu'];
+ public displayedColumnsMobile: string[] = ['title', 'speakers'];
public isNumberingAllowed: boolean;
@@ -263,6 +263,9 @@ export class AgendaListComponent extends ListViewBaseComponent i
*/
public getColumnDefinition(): string[] {
let columns = this.vp.isMobile ? this.displayedColumnsMobile : this.displayedColumnsDesktop;
+ if (this.operator.hasPerms('agenda.can_manage')) {
+ columns = columns.concat(['menu']);
+ }
if (this.operator.hasPerms('core.can_manage_projector') && !this.isMultiSelect) {
columns = ['projector'].concat(columns);
}
diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.scss b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.scss
index 0cf51ced4..1a3d61ec0 100644
--- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.scss
+++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.scss
@@ -63,7 +63,7 @@
}
.add-self-buttons {
- padding: 0 0 20px 25px;
+ padding: 20px 0 20px 25px;
}
.speaker-warning {
diff --git a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
index 3c458af62..c1658ffc7 100644
--- a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
+++ b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
@@ -111,9 +111,11 @@
mic
List of speakers
-
-
+
+
+
+
diff --git a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts
index be5147aa6..17e886f64 100644
--- a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts
+++ b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts
@@ -230,9 +230,9 @@ export class TopicDetailComponent extends BaseViewComponent {
public isAllowed(action: string): boolean {
switch (action) {
case 'see':
- return this.operator.hasPerms('agenda.can_manage');
- case 'edit':
return this.operator.hasPerms('agenda.can_see');
+ case 'edit':
+ return this.operator.hasPerms('agenda.can_manage');
case 'default':
return false;
}
diff --git a/client/src/app/site/login/components/login-mask/login-mask.component.scss b/client/src/app/site/login/components/login-mask/login-mask.component.scss
index 80018d267..8f97a07e9 100644
--- a/client/src/app/site/login/components/login-mask/login-mask.component.scss
+++ b/client/src/app/site/login/components/login-mask/login-mask.component.scss
@@ -24,6 +24,7 @@ mat-form-field {
right: 0;
margin-left: auto;
margin-right: auto;
+ z-index: 2;
}
}
diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.html b/client/src/app/site/users/components/user-detail/user-detail.component.html
index 174dd6832..1d6d653e3 100644
--- a/client/src/app/site/users/components/user-detail/user-detail.component.html
+++ b/client/src/app/site/users/components/user-detail/user-detail.component.html
@@ -16,7 +16,12 @@