ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4161 from MaximilianKrambach/passwordRestrictions

Browse Source 
reset password permission check in menu
This commit is contained in:
Sean 2019-01-22 11:26:59 +01:00 committed by GitHub
commit 20bb92466b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/core/marked-translations.ts
View File

@ -288,10 +288,13 @@ _('Can support motions');
_('Can manage motions'); _('Can manage motions');
_('Can see comments'); _('Can see comments');
_('Can manage comments'); _('Can manage comments');
_('Can manage motion metadata');
_('Can create amendments');
// users // users
_('Can see names of users'); _('Can see names of users');
_('Can see extra data of users (e.g. present and comment)'); _('Can see extra data of users (e.g. present and comment)');
_('Can manage users'); _('Can manage users');
_('Can change its own password');
// users config strings // users config strings
_('General'); _('General');

50
client/src/app/site/site.component.html
View File

@ -13,9 +13,7 @@
<div class="nav-toolbar"> <div class="nav-toolbar">
<!-- logo --> <!-- logo -->
<a routerLink="/" (click)="toggleSideNav()"> <a routerLink="/" (click)="toggleSideNav()">
<os-logo class="os-logo-container" <os-logo class="os-logo-container" inputAction="logo_web_header" [footer]="false"></os-logo>
inputAction="logo_web_header"
[footer]="false"></os-logo>
</a> </a>
</div> </div>
@ -30,22 +28,26 @@
<mat-icon>language</mat-icon> <mat-icon>language</mat-icon>
<span> {{ getLangName(this.translate.currentLang) }} </span> <span> {{ getLangName(this.translate.currentLang) }} </span>
</a> </a>
<a *ngIf="isLoggedIn" (click)="editProfile()" mat-list-item> <div *ngIf="isLoggedIn">
<mat-icon>person</mat-icon> <a (click)="editProfile()" mat-list-item>
<span translate>Edit profile</span> <mat-icon>person</mat-icon>
</a> <span translate>Edit profile</span>
<a *ngIf="isLoggedIn" (click)="changePassword()" mat-list-item> </a>
<mat-icon>vpn_key</mat-icon> <a *osPerms="'users.can_change_password'" (click)="changePassword()" mat-list-item>
<span translate>Change password</span> <mat-icon>vpn_key</mat-icon>
</a> <span translate>Change password</span>
<a *ngIf="isLoggedIn" (click)="logout()" mat-list-item> </a>
<mat-icon>exit_to_app</mat-icon> <a *ngIf="isLoggedIn" (click)="logout()" mat-list-item>
<span translate>Logout</span> <mat-icon>exit_to_app</mat-icon>
</a> <span translate>Logout</span>
<a *ngIf="!isLoggedIn" routerLink="/login" mat-list-item> </a>
<mat-icon>exit_to_app</mat-icon> </div>
<span translate>Login</span> <div *ngIf="!isLoggedIn">
</a> <a routerLink="/login" mat-list-item>
<mat-icon>exit_to_app</mat-icon>
<span translate>Login</span>
</a>
</div>
</mat-nav-list> </mat-nav-list>
</mat-expansion-panel> </mat-expansion-panel>
<!-- TODO: Could use translate.getLangs() to fetch available languages --> <!-- TODO: Could use translate.getLangs() to fetch available languages -->
@ -109,13 +111,11 @@
target="_blank" target="_blank"
(click)="mobileAutoCloseNav()" (click)="mobileAutoCloseNav()"
> >
<span><small><os-copyright-sign></os-copyright-sign>&nbsp;Copyright by OpenSlides</small></span> <span>
<small><os-copyright-sign></os-copyright-sign>&nbsp;Copyright by OpenSlides</small>
</span>
</a> </a>
<div class="os-footer-logo-container"> <div class="os-footer-logo-container"><os-logo inputAction="logo_web_header" footer="true"> </os-logo></div>
<os-logo inputAction="logo_web_header"
footer="true">
</os-logo>
</div>
</mat-nav-list> </mat-nav-list>
</mat-sidenav> </mat-sidenav>
<mat-sidenav-content> <mat-sidenav-content>