hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

clean up

pull/57/head
HardiReady 2019-02-23 20:56:54 +01:00
parent 2e193dff32
commit 430d4ce7da
2 changed files with 32 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
static/src/app/app.component.html
View File

@ -1,5 +1,5 @@
<div>
<mat-sidenav-container>
<mat-sidenav-container>
<mat-sidenav-content>
<app-header (sidenavToggle)="sidenav.toggle()"></app-header>
<main>
@ -19,170 +19,19 @@
<mat-sidenav #sidenav role="navigation">
<app-sidenav-list (sidenavClose)="sidenav.close()"></app-sidenav-list>
</mat-sidenav>
</mat-sidenav-container>
</mat-sidenav-container>
<div *ngIf="loading" class="load-indicator">
<div *ngIf="loading" class="load-indicator">
<div class="opt-loader"></div>
<mat-icon svgIcon="opt-logo-core" class="opt-logo-core"></mat-icon>
</div>
</div>
<button mat-icon-button
<button mat-icon-button
mat-mini-fab
id="scrollTopBtn"
*ngIf="scrollTopVisible"
matTooltip="{{'navigation.button.scroll.top' | translate}}"
(click)="scrollToTop()">
<mat-icon svgIcon="arrow-up"></mat-icon>
</button>
</button>
</div>
<!--<div class="container">-->
<!--<nav class="navbar navbar-inverse navbar-fixed-top">-->
<!--<div class="container-fluid">-->
<!--<div class="navbar-header">-->
<!--</div>-->
<!--<div class="collapse navbar-collapse">-->
<!--<ul class="nav navbar-nav">-->
<!--<li routerLinkActive="active">-->
<!--<a href="https://www.opt4.net/dashboard" class="link">{{'navigation.top.board' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.overviewPath}}' class="link">{{'navigation.top.overview' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a [routerLink]="[config.publicPath.concat('/').concat(config.rankPath)]" class="link">{{'navigation.top.ranks' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a [routerLink]="[config.publicPath.concat('/').concat(config.decorationPath)]" class="link">{{'navigation.top.decorations' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.statsPath}}' class="link">{{'navigation.top.statistics' | translate}}</a>-->
<!--</li>-->
<!--<li *ngIf="loginService.hasPermission(2)"-->
<!--class="dropdown">-->
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"-->
<!--aria-expanded="false">-->
<!--{{'navigation.top.management' | translate}}-->
<!--<span class="caret"></span>-->
<!--</a>-->
<!--<ul class="dropdown-menu">-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.manageUserPath}}' class="link">{{'navigation.top.management.users' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.manageSquadPath}}' class="link">{{'navigation.top.management.squads' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.manageDecorationPath}}' class="link">{{'navigation.top.management.decorations' | translate}}</a>-->
<!--</li>-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.manageRankPath}}' class="link">{{'navigation.top.management.ranks' | translate}}</a>-->
<!--</li>-->
<!--</ul>-->
<!--</li>-->
<!--<li *ngIf="loginService.hasPermission(1) && !loginService.hasPermission(2) && loginService.hasSquad()"-->
<!--class="dropdown">-->
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"-->
<!--aria-expanded="false">-->
<!--{{'navigation.top.request' | translate}}-->
<!--<span class="caret"></span>-->
<!--</a>-->
<!--<ul class="dropdown-menu">-->
<!--<li>-->
<!--<a routerLink="{{config.request}}/{{config.sqlDashboardPath}}">{{'navigation.top.request.open' | translate}}</a>-->
<!--</li>-->
<!--<li>-->
<!--<a routerLink="{{config.request}}/{{config.requestPromotionPath}}">{{'navigation.top.request.promotion' | translate}}</a>-->
<!--</li>-->
<!--<li>-->
<!--<a routerLink="{{config.request}}/{{config.requestAwardPath}}">{{'navigation.top.request.award' | translate}}</a>-->
<!--</li>-->
<!--</ul>-->
<!--</li>-->
<!--<li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">-->
<!--<a href="#"-->
<!--[ngClass]="{'unprocessed': promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards}"-->
<!--class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"-->
<!--aria-expanded="false">-->
<!--{{'navigation.top.request.manage' | translate}}-->
<!--<span class="caret"></span>-->
<!--</a>-->
<!--<ul class="dropdown-menu">-->
<!--<li>-->
<!--<a [ngClass]="{'unprocessed-child': promotionService.hasUnprocessedPromotion}"-->
<!--routerLink="{{config.request}}/{{config.confirmPromotionPath}}">{{'navigation.top.request.promotion' | translate}}</a>-->
<!--</li>-->
<!--<li>-->
<!--<a [ngClass]="{'unprocessed-child': awardingService.hasUnprocessedAwards}"-->
<!--routerLink="{{config.request}}/{{config.confirmAwardPath}}">{{'navigation.top.request.award' | translate}}</a>-->
<!--</li>-->
<!--</ul>-->
<!--</li>-->
<!--</ul>-->
<!--<ul class="nav navbar-nav pull-right">-->
<!--<li *ngIf="loginService.hasPermission(4)"-->
<!--class="dropdown">-->
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"-->
<!--aria-expanded="false">-->
<!--{{'navigation.top.admin' | translate}}-->
<!--<span class="caret"></span>-->
<!--</a>-->
<!--<ul class="dropdown-menu">-->
<!--<li routerLinkActive="active">-->
<!--<a routerLink='{{config.adminPanelAppUsersPath}}' class="link">{{'navigation.top.management.users' | translate}}</a>-->
<!--</li>-->
<!--</ul>-->
<!--</li>-->
<!--<li *ngIf="loginService.isLoggedIn()" class="link" style="cursor: pointer">-->
<!--<a (click)="logout()">{{'navigation.top.logout' | translate}}</a>-->
<!--</li>-->
<!--<li *ngIf="!loginService.isLoggedIn()" routerLinkActive="active">-->
<!--<a routerLink='{{config.loginPath}}' class="link">{{'navigation.top.login' | translate}}</a>-->
<!--</li>-->
<!--<li class="dropdown" *ngIf="features.localization">-->
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">-->
<!--<span class="text-uppercase">{{language}}</span>-->
<!--<span class="caret"></span>-->
<!--</a>-->
<!--<ul class="dropdown-menu">-->
<!--<li *ngFor="let lang of languages" style="cursor: pointer">-->
<!--<a (click)="setLanguage(lang)"><mat-icon svgIcon="flag-{{lang}}"></mat-icon></a>-->
<!--</li>-->
<!--</ul>-->
<!--</li>-->
<!--</ul>-->
<!--</div>-->
<!--</div>-->
<!--</nav>-->
<!--</div>-->
<!--<div>-->
<!--<router-outlet></router-outlet>-->
<!--<div id="left">-->
<!--<router-outlet name="left"></router-outlet>-->
<!--</div>-->
<!--<div id="right">-->
<!--<router-outlet name="right"></router-outlet>-->
<!--</div>-->
<!--</div>-->
<!--<div *ngIf="loading" class="load-indicator">-->
<!--<div class="opt-loader"></div>-->
<!--<mat-icon svgIcon="opt-logo-core" class="opt-logo-core"></mat-icon>-->
<!--</div>-->
<!--<button mat-icon-button-->
<!--mat-mini-fab-->
<!--id="scrollTopBtn"-->
<!--*ngIf="scrollTopVisible"-->
<!--matTooltip="{{'navigation.button.scroll.top' | translate}}"-->
<!--(click)="scrollToTop()">-->
<!--<mat-icon svgIcon="arrow-up"></mat-icon>-->
<!--</button>-->

2
static/src/app/app.component.ts
View File

@ -91,7 +91,7 @@ export class AppComponent implements OnInit {
}
ngOnInit() {
Observable.fromEvent(this.document, "scroll").subscribe(e => {
Observable.fromEvent(this.document, 'scroll').subscribe(e => {
this.scrollTopVisible = document.body.scrollTop > this.scrollBtnVisibleVal
|| document.documentElement.scrollTop > this.scrollBtnVisibleVal;
});