Merge branch 'master' into skeleton

Updated Angular Calendar due to broken AoT
2025-12-27 15:47:08 +00:00 · 2018-01-02 12:37:12 +03:00 · 2018-01-02 12:32:01 +03:00 · 2018-01-02 12:29:32 +03:00 · 2018-01-02 12:00:46 +03:00 · 2017-12-28 14:00:06 +03:00
45 changed files with 781 additions and 457 deletions
--- a/1
+++ b/1
@@ -0,0 +1 @@
+https://themeforest.net/licenses/terms/regular
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "fuse2",
-  "version": "1.2.3",
-  "license": "",
+  "version": "1.3.1",
+  "license": "https://themeforest.net/licenses/terms/regular",
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
@@ -16,54 +16,61 @@
  "private": true,
  "dependencies": {
    "@agm/core": "1.0.0-beta.2",
-    "@angular/animations": "5.0.3",
-    "@angular/cdk": "5.0.0-rc.1",
-    "@angular/common": "5.0.3",
-    "@angular/compiler": "5.0.3",
-    "@angular/core": "5.0.3",
-    "@angular/flex-layout": "2.0.0-beta.10-4905443",
-    "@angular/forms": "5.0.3",
-    "@angular/http": "5.0.3",
-    "@angular/material": "5.0.0-rc.1",
-    "@angular/material-moment-adapter": "5.0.0-rc.1",
-    "@angular/platform-browser": "5.0.3",
-    "@angular/platform-browser-dynamic": "5.0.3",
-    "@angular/router": "5.0.3",
-    "@ngx-translate/core": "8.0.0",
+    "@angular/animations": "5.1.2",
+    "@angular/cdk": "5.0.2",
+    "@angular/common": "5.1.2",
+    "@angular/compiler": "5.1.2",
+    "@angular/core": "5.1.2",
+    "@angular/flex-layout": "2.0.0-beta.12",
+    "@angular/forms": "5.1.2",
+    "@angular/http": "5.1.2",
+    "@angular/material": "5.0.2",
+    "@angular/material-moment-adapter": "5.0.2",
+    "@angular/platform-browser": "5.1.2",
+    "@angular/platform-browser-dynamic": "5.1.2",
+    "@angular/router": "5.1.2",
+    "@ngx-translate/core": "9.0.2",
    "@swimlane/ngx-charts": "7.0.1",
-    "@swimlane/ngx-datatable": "11.1.4",
-    "@withinpixels/ngx-dnd": "3.1.0",
-    "angular-calendar": "0.22.1",
+    "@swimlane/ngx-datatable": "11.1.7",
+    "@swimlane/ngx-dnd": "3.1.0",
+    "angular-calendar": "0.23.0",
+    "angular-in-memory-web-api": "0.5.2",
+    "angular2-markdown": "1.6.0",
    "classlist.js": "1.1.20150312",
-    "core-js": "2.5.1",
+    "core-js": "2.5.3",
    "d3": "4.12.0",
    "hammerjs": "2.0.8",
    "highlight.js": "9.12.0",
    "intl": "1.2.5",
-    "moment": "2.19.2",
-    "ngx-color-picker": "5.0.4",
+    "moment": "2.20.1",
+    "@ngrx/effects": "4.1.1",
+    "@ngrx/router-store": "4.1.1",
+    "@ngrx/store": "4.1.1",
+    "@ngrx/store-devtools": "4.1.1",
+    "ngrx-store-freeze": "0.2.0",
+    "ngx-color-picker": "5.3.0",
    "ngx-cookie-service": "1.0.9",
-    "perfect-scrollbar": "1.2.0",
-    "rxjs": "5.5.2",
+    "perfect-scrollbar": "1.3.0",
+    "rxjs": "5.5.6",
    "web-animations-js": "2.3.1",
    "zone.js": "0.8.18"
  },
  "devDependencies": {
-    "@angular/cli": "1.5.4",
-    "@angular/compiler-cli": "5.0.3",
-    "@angular/language-service": "5.0.3",
+    "@angular/cli": "1.6.2",
+    "@angular/compiler-cli": "5.1.2",
+    "@angular/language-service": "5.1.2",
    "@angularclass/hmr": "2.1.3",
    "@types/jasmine": "2.5.54",
    "@types/jasminewd2": "2.0.3",
-    "@types/node": "6.0.92",
-    "codelyzer": "4.0.1",
+    "@types/node": "6.0.95",
+    "codelyzer": "4.0.2",
    "jasmine-core": "2.6.4",
    "jasmine-spec-reporter": "4.1.1",
    "karma": "1.7.1",
    "karma-chrome-launcher": "2.1.1",
    "karma-cli": "1.0.1",
-    "karma-coverage-istanbul-reporter": "1.3.0",
-    "karma-jasmine": "1.1.0",
+    "karma-coverage-istanbul-reporter": "1.3.1",
+    "karma-jasmine": "1.1.1",
    "karma-jasmine-html-reporter": "0.2.2",
    "protractor": "5.1.2",
    "ts-node": "3.2.2",
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,6 +1,12 @@
 import { Component } from '@angular/core';
 import { FuseSplashScreenService } from './core/services/splash-screen.service';
 import { TranslateService } from '@ngx-translate/core';
+import { FuseTranslationLoaderService } from './core/services/translation-loader.service';
+
+import { FuseNavigationService } from './core/components/navigation/navigation.service';
+import { FuseNavigationModel } from './navigation/navigation.model';
+import { locale as navigationEnglish } from './navigation/i18n/en';
+import { locale as navigationTurkish } from './navigation/i18n/tr';

@Component({
    selector   : 'fuse-root',
@@ -10,8 +16,10 @@ import { TranslateService } from '@ngx-translate/core';
 export class AppComponent
 {
    constructor(
+        private fuseNavigationService: FuseNavigationService,
        private fuseSplashScreen: FuseSplashScreenService,
-        private translate: TranslateService
+        private translate: TranslateService,
+        private translationLoader: FuseTranslationLoaderService
    )
    {
        // Add languages
@@ -22,5 +30,11 @@ export class AppComponent

        // Use a language
        this.translate.use('en');
+
+        // Set the navigation model
+        this.fuseNavigationService.setNavigationModel(new FuseNavigationModel());
+
+        // Set the navigation translations
+        this.translationLoader.loadTranslations(navigationEnglish, navigationTurkish);
    }
 }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { HttpModule } from '@angular/http';
 import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule, Routes } from '@angular/router';
@@ -27,7 +26,6 @@ const appRoutes: Routes = [
    ],
    imports     : [
        BrowserModule,
-        HttpModule,
        HttpClientModule,
        BrowserAnimationsModule,
        RouterModule.forRoot(appRoutes),
--- a/src/app/core/animations.ts
+++ b/src/app/core/animations.ts
@@ -76,6 +76,53 @@ export const fuseAnimations = [
        transition('0 => 1', animate('300ms ease-in'))
    ]),

+    trigger('slideIn', [
+        transition('void => left', [
+                style({
+                    transform: 'translateX(100%)'
+                }),
+                animate('300ms ease-in',
+                    style({
+                        transform: 'translateX(0)'
+                    })
+                )
+            ]
+        ),
+        transition('left => void', [
+                style({
+                    transform: 'translateX(0)'
+                }),
+                animate('300ms ease-in',
+                    style({
+                        transform: 'translateX(-100%)'
+                    })
+                )
+            ]
+        ),
+        transition('void => right', [
+                style({
+                    transform: 'translateX(-100%)'
+                }),
+                animate('300ms ease-in',
+                    style({
+                        transform: 'translateX(0)'
+                    })
+                )
+            ]
+        ),
+        transition('right => void', [
+                style({
+                    transform: 'translateX(0)'
+                }),
+                animate('300ms ease-in',
+                    style({
+                        transform: 'translateX(100%)'
+                    })
+                )
+            ]
+        ),
+    ]),
+
    trigger('slideInLeft', [
        state('void', style({
            transform: 'translateX(-100%)',
--- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
+++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
@@ -1,6 +1,10 @@
 <a class="nav-link" matRipple>
    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-    <span class="nav-link-title">{{item.title}}</span>
+    <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
+          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
+        {{item.badge.title}}
+    </span>
    <mat-icon class="collapse-arrow">keyboard_arrow_right</mat-icon>
 </a>

--- a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html
+++ b/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html
@@ -1,8 +1,8 @@
 <a class="nav-link" *ngIf="item.url" [routerLink]="[item.url]" routerLinkActive="active"
   [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-    <span class="nav-link-title">{{item.title}}</span>
-    <span class="nav-link-badge" *ngIf="item.badge"
+    <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
        {{item.badge.title}}
    </span>
@@ -10,8 +10,8 @@

 <span class="nav-link" *ngIf="item.function" (click)="item.function()" matRipple>
    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-    <span class="nav-link-title">{{item.title}}</span>
-    <span class="nav-link-badge" *ngIf="item.badge"
+    <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
        {{item.badge.title}}
    </span>
--- a/src/app/core/components/navigation/navigation.model.ts
+++ b/src/app/core/components/navigation/navigation.model.ts
@@ -0,0 +1,5 @@
+export interface FuseNavigationModelInterface
+{
+    model: any[];
+}
+
--- a/src/app/core/components/navigation/navigation.service.ts
+++ b/src/app/core/components/navigation/navigation.service.ts
@@ -1,6 +1,6 @@
 import { EventEmitter, Injectable } from '@angular/core';
-import { NavigationModel } from '../../../navigation.model';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { FuseNavigationModelInterface } from './navigation.model';

@Injectable()
 export class FuseNavigationService
@@ -8,13 +8,11 @@ export class FuseNavigationService
    onNavCollapseToggle = new EventEmitter<any>();
    onNavCollapseToggled = new EventEmitter<any>();
    onNavigationModelChange: BehaviorSubject<any> = new BehaviorSubject({});
-    navigationModel: NavigationModel;
+    navigationModel: FuseNavigationModelInterface;
    flatNavigation: any[] = [];

    constructor()
    {
-        this.navigationModel = new NavigationModel();
-        this.onNavigationModelChange.next(this.navigationModel.model);
    }

    /**
@@ -155,8 +153,15 @@ export class FuseNavigationService
     */
    getFlatNavigation(navigationItems?)
    {
+        // If navigation items not provided,
+        // that means we are running the function
+        // for the first time...
        if ( !navigationItems )
        {
+            // Reset the flat navigation
+            this.flatNavigation = [];
+
+            // Get the entire navigation model
            navigationItems = this.navigationModel.model;
        }

@@ -181,7 +186,10 @@ export class FuseNavigationService

            if ( navItem.type === 'collapse' || navItem.type === 'group' )
            {
-                this.getFlatNavigation(navItem.children);
+                if ( navItem.children )
+                {
+                    this.getFlatNavigation(navItem.children);
+                }
            }
        }

--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
@@ -1,8 +1,13 @@
 <a class="nav-link" matRipple (click)="toggleOpen($event)">
    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-    <span class="nav-link-title">{{item.title}}</span>
+    <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
+          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
+        {{item.badge.title}}
+    </span>
    <mat-icon class="collapse-arrow">keyboard_arrow_right</mat-icon>
 </a>
+
 <div class="children" [@slideInOut]="isOpen">
    <ng-container *ngFor="let item of item.children">
        <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -69,6 +69,20 @@ export class FuseNavVerticalCollapseComponent implements OnInit
            );
    }

+    ngOnInit()
+    {
+        // Check if the url can be found in
+        // one of the children of this item
+        if ( this.isUrlInChildren(this.item, this.router.url) )
+        {
+            this.expand();
+        }
+        else
+        {
+            this.collapse();
+        }
+    }
+
    /**
     * Toggle collapse
     *
@@ -108,6 +122,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        {
            return;
        }
+
        this.isOpen = false;
        this.navigationService.onNavCollapseToggle.emit();
    }
@@ -175,8 +190,4 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        return false;
    }

-    ngOnInit()
-    {
-    }
-
 }
--- a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
@@ -1,6 +1,7 @@
 <div class="group-title">
-    <span class="hint-text">{{ item.title }}</span>
+    <span class="hint-text" [translate]="item.translate">{{ item.title }}</span>
 </div>
+
 <div class="group-items">
    <ng-container *ngFor="let item of item.children">
        <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
--- a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.html
+++ b/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.html
@@ -1,8 +1,8 @@
 <a class="nav-link" *ngIf="item.url" [routerLink]="[item.url]" routerLinkActive="active"
   [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-    <span class="nav-link-title">{{item.title}}</span>
-    <span class="nav-link-badge" *ngIf="item.badge"
+    <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
        {{item.badge.title}}
    </span>
@@ -10,8 +10,8 @@

 <span class="nav-link" *ngIf="item.function" (click)="item.function()" matRipple>
    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-    <span class="nav-link-title">{{item.title}}</span>
-    <span class="nav-link-badge" *ngIf="item.badge"
+    <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
        {{item.badge.title}}
    </span>
--- a/src/app/core/components/widget/widget.component.scss
+++ b/src/app/core/components/widget/widget.component.scss
@@ -62,4 +62,23 @@ fuse-widget {
            transform: rotateY(360deg);
        }
    }
+
+    .mat-form-field {
+
+        &.mat-form-field-type-mat-select {
+
+            .mat-input-wrapper {
+                padding: 16px 0;
+
+                .mat-input-infix {
+                    border: none;
+                    padding: 0;
+                }
+            }
+
+            .mat-input-underline {
+                display: none;
+            }
+        }
+    }
 }
--- a/src/app/core/components/widget/widget.component.ts
+++ b/src/app/core/components/widget/widget.component.ts
@@ -27,7 +27,9 @@ export class FuseWidgetComponent implements OnInit, AfterContentInit
        setTimeout(() => {

            this.toggleButtons.forEach(flipButton => {
-                this.renderer.listen(flipButton.el.nativeElement, 'click', () => {
+                this.renderer.listen(flipButton.el.nativeElement, 'click', (event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
                    this.toggle();
                });
            });
--- a/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
+++ b/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
@@ -7,7 +7,7 @@ import { Platform } from '@angular/cdk/platform';
@Directive({
    selector: '[fusePerfectScrollbar]'
 })
-export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnDestroy
+export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy
 {
    onSettingsChanged: Subscription;
    isDisableCustomScrollbars = false;
@@ -16,7 +16,7 @@ export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnD
    ps;

    constructor(
-        private element: ElementRef,
+        public element: ElementRef,
        private fuseConfig: FuseConfigService,
        private platform: Platform
    )
@@ -35,11 +35,6 @@ export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnD
        }
    }

-    ngOnInit()
-    {
-
-    }
-
    ngAfterViewInit()
    {
        if ( this.isMobile || this.isDisableCustomScrollbars )
@@ -49,12 +44,14 @@ export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnD
        }

        // Initialize the perfect-scrollbar
-        this.ps = new PerfectScrollbar(this.element.nativeElement);
+        this.ps = new PerfectScrollbar(this.element.nativeElement, {
+            wheelPropagation: true
+        });
    }

    ngOnDestroy()
    {
-        if ( !this.isInitialized )
+        if ( !this.isInitialized || !this.ps )
        {
            return;
        }
--- a/src/app/core/modules/shared.module.ts
+++ b/src/app/core/modules/shared.module.ts
@@ -5,7 +5,7 @@ import { CommonModule } from '@angular/common';
 import { MaterialModule } from './material.module';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { ColorPickerModule } from 'ngx-color-picker';
-import { NgxDnDModule } from '@withinpixels/ngx-dnd';
+import { NgxDnDModule } from '@swimlane/ngx-dnd';
 import { NgxDatatableModule } from '@swimlane/ngx-datatable';

 import { FuseMatSidenavHelperDirective, FuseMatSidenavTogglerDirective } from '../directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive';
--- a/src/app/core/scss/partials/_angular-material-fix.scss
+++ b/src/app/core/scss/partials/_angular-material-fix.scss
@@ -28,3 +28,51 @@
 .mat-form-field-underline {
    background-color: rgba(0, 0, 0, 0.12);
 }
+
+// Fix: "Some idiots using table-cell and inline-table in mat-select"
+.mat-form-field {
+
+    &.mat-form-field-type-mat-select {
+
+        .mat-input-infix {
+            display: inline-flex;
+            width: auto;
+
+            .mat-select-trigger {
+                display: inline-flex;
+                align-items: center;
+                width: 100%;
+
+                .mat-select-value {
+                    display: flex;
+                    max-width: none;
+                    margin-right: 8px;
+                }
+
+                .mat-select-arrow-wrapper {
+                    display: inline-flex;
+                }
+            }
+        }
+    }
+}
+
+// Fix: "Stepper icons are broken due to Fuse's icon helpers"
+mat-horizontal-stepper,
+mat-vertical-stepper {
+
+    mat-step-header {
+
+        mat-icon {
+            height: 16px !important;
+            width: 16px !important;
+            min-width: 0 !important;
+            min-height: 0 !important;
+            color: rgba(255, 255, 255, 0.87) !important;
+        }
+    }
+}
+
+mat-vertical-stepper {
+    padding: 16px 0;
+}
--- a/src/app/core/scss/partials/_navigation.scss
+++ b/src/app/core/scss/partials/_navigation.scss
@@ -47,14 +47,20 @@
            }

            .nav-link-badge {
+                display: flex;
+                align-items: center;
                min-width: 20px;
                height: 20px;
-                line-height: 20px;
                padding: 0 7px;
                font-size: 11px;
                font-weight: 500;
                border-radius: 20px;
                transition: opacity 0.2s ease-in-out 0.1s;
+                margin-left: 8px;
+
+                + .collapse-arrow {
+                    margin-left: 8px;
+                }
            }

            &:hover {
--- a/src/app/core/scss/partials/_print.scss
+++ b/src/app/core/scss/partials/_print.scss
@@ -42,8 +42,8 @@
        fuse-footer,
        fuse-quick-panel,
        fuse-theme-options,
-        .ps > .ps__scrollbar-x-rail,
-        .ps > .ps__scrollbar-y-rail {
+        .ps > .ps__rail-x,
+        .ps > .ps__rail-y {
            display: none !important;
        }

--- a/src/app/core/scss/partials/plugins/_ngx-color-picker.scss
+++ b/src/app/core/scss/partials/plugins/_ngx-color-picker.scss
@@ -3,20 +3,21 @@
 .color-picker {
    height: auto !important;
    border: none !important;
+
    @include mat-elevation(4);

    .preset-area {
-        //padding: 4px 15px;
-        padding: 0 0 12px 12px !important;
+        padding: 0 0 16px 16px !important;
        height: 140px;
        overflow-y: auto;
        overflow-x: hidden;
+
        > hr {
            display: none;
        }
+
        .preset-label {
            display: none;
-
        }

        .preset-color {
@@ -25,7 +26,8 @@
            margin: 0 !important;
            border: none !important;
            border-radius: 0 !important;
-            &:nth-child(14n+3) {
+
+            &:nth-child(14n+1) {
                clear: both;
            }
        }
--- a/src/app/core/services/config.service.ts
+++ b/src/app/core/services/config.service.ts
@@ -34,7 +34,7 @@ export class FuseConfigService
                footer : 'mat-fuse-dark-900-bg'
            },
            customScrollbars: true,
-            routerAnimation : 'fadeIn' // fadeIn, slideUp, slideDown, slideRight, slideLeft
+            routerAnimation : 'fadeIn' // fadeIn, slideUp, slideDown, slideRight, slideLeft, none
        };

        /**
--- a/src/app/main/navbar/vertical/navbar-vertical.component.scss
+++ b/src/app/main/navbar/vertical/navbar-vertical.component.scss
@@ -123,6 +123,7 @@ fuse-navbar-vertical {

            .logo-icon {
                width: 38px;
+                height: 38px;
            }

            .logo-text {
--- a/src/app/main/quick-panel/quick-panel.component.html
+++ b/src/app/main/quick-panel/quick-panel.component.html
@@ -1,6 +1,6 @@
-<mat-list class="date" cdk-focus-region-start>
+<mat-list class="date" cdkFocusRegionStart>

-    <h3 matSubheader cdk-focus-init>
+    <h3 matSubheader cdkFocusInit>
        <span>Today</span>
    </h3>

@@ -16,7 +16,7 @@
    </div>
 </mat-list>

-<mat-divider cdk-focus-region-end></mat-divider>
+<mat-divider cdkFocusRegionEnd></mat-divider>

 <mat-list>
    <h3 matSubheader>
--- a/src/app/navigation/i18n/en.ts
+++ b/src/app/navigation/i18n/en.ts
@@ -0,0 +1,12 @@
+export const locale = {
+    lang: 'en',
+    data: {
+        'NAV': {
+            'APPLICATIONS': 'Applications',
+            'SAMPLE'        : {
+                'TITLE': 'Sample',
+                'BADGE': '25'
+            }
+        }
+    }
+};
--- a/src/app/navigation/i18n/tr.ts
+++ b/src/app/navigation/i18n/tr.ts
@@ -0,0 +1,12 @@
+export const locale = {
+    lang: 'tr',
+    data: {
+        'NAV': {
+            'APPLICATIONS': 'Programlar',
+            'SAMPLE'        : {
+                'TITLE': 'Örnek',
+                'BADGE': '15'
+            }
+        }
+    }
+};
--- a/src/app/navigation/navigation.model.ts
+++ b/src/app/navigation/navigation.model.ts
@@ -1,4 +1,6 @@
-export class NavigationModel
+import { FuseNavigationModelInterface } from '../core/components/navigation/navigation.model';
+
+export class FuseNavigationModel implements FuseNavigationModelInterface
 {
    public model: any[];

@@ -8,16 +10,19 @@ export class NavigationModel
            {
                'id'      : 'applications',
                'title'   : 'Applications',
+                'translate': 'NAV.APPLICATIONS',
                'type'    : 'group',
                'children': [
                    {
                        'id'   : 'sample',
                        'title': 'Sample',
+                        'translate': 'NAV.SAMPLE.TITLE',
                        'type' : 'item',
                        'icon' : 'email',
                        'url'  : '/sample',
                        'badge': {
                            'title': 25,
+                            'translate': 'NAV.SAMPLE.BADGE',
                            'bg'   : '#F44336',
                            'fg'   : '#FFFFFF'
                        }
--- a/src/assets/images/backgrounds/april.jpg
+++ b/src/assets/images/backgrounds/april.jpg
--- a/src/assets/images/backgrounds/august.jpg
+++ b/src/assets/images/backgrounds/august.jpg
--- a/src/assets/images/backgrounds/autumn.jpg
+++ b/src/assets/images/backgrounds/autumn.jpg
--- a/src/assets/images/backgrounds/dark-material-bg.jpg
+++ b/src/assets/images/backgrounds/dark-material-bg.jpg
--- a/src/assets/images/backgrounds/december.jpg
+++ b/src/assets/images/backgrounds/december.jpg
--- a/src/assets/images/backgrounds/february.jpg
+++ b/src/assets/images/backgrounds/february.jpg
--- a/src/assets/images/backgrounds/january.jpg
+++ b/src/assets/images/backgrounds/january.jpg
--- a/src/assets/images/backgrounds/july.jpg
+++ b/src/assets/images/backgrounds/july.jpg
--- a/src/assets/images/backgrounds/june.jpg
+++ b/src/assets/images/backgrounds/june.jpg
--- a/src/assets/images/backgrounds/march.jpg
+++ b/src/assets/images/backgrounds/march.jpg
--- a/src/assets/images/backgrounds/may.jpg
+++ b/src/assets/images/backgrounds/may.jpg
--- a/src/assets/images/backgrounds/november.jpg
+++ b/src/assets/images/backgrounds/november.jpg
--- a/src/assets/images/backgrounds/october.jpg
+++ b/src/assets/images/backgrounds/october.jpg
--- a/src/assets/images/backgrounds/september.jpg
+++ b/src/assets/images/backgrounds/september.jpg
--- a/src/assets/images/backgrounds/spring.jpg
+++ b/src/assets/images/backgrounds/spring.jpg
--- a/src/assets/images/backgrounds/summer.jpg
+++ b/src/assets/images/backgrounds/summer.jpg
--- a/src/assets/images/backgrounds/winter.jpg
+++ b/src/assets/images/backgrounds/winter.jpg
Author	SHA1	Message	Date
Sercan Yemen	33d295f42c	Merge branch 'master' into skeleton	2018-01-02 12:37:12 +03:00
Sercan Yemen	91e277ce3f	Merge branch 'master' into skeleton	2018-01-02 12:32:01 +03:00
Sercan Yemen	5f2372cc08	Updated Angular Calendar due to broken AoT	2018-01-02 12:29:32 +03:00
Sercan Yemen	6f315aa38e	Small fixes to Auth pages	2018-01-02 12:00:46 +03:00
Sercan Yemen	0653b5f36b	Academy app small tweaks and responsive fixes	2017-12-28 14:00:06 +03:00
Sercan Yemen	f13120bc01	Updated Academy example data	2017-12-28 11:53:02 +03:00
Sercan Yemen	b7a3d35eb8	Updated package-lock.json	2017-12-28 10:52:40 +03:00
Sercan Yemen	f29f11232f	Merge branch 'master' into skeleton	2017-12-28 10:51:09 +03:00
Sercan Yemen	a6c56518bc	New: Academy (Courses) app	2017-12-28 10:49:29 +03:00
Sercan Yemen	ecae48f3d0	Updated Angular and Angular Material + various other components + Increased the Fuse version number	2017-12-28 10:49:04 +03:00
Sercan Yemen	c74751e0f4	Added new SlideIn Animation + Improvements on perfect scrollbar	2017-12-28 10:48:05 +03:00
Sercan Yemen	2b755fa669	Replaced depreciated Quick panel focus helpers	2017-12-28 10:47:19 +03:00
Sercan Yemen	16ffb09350	Merge branch 'master' into skeleton	2017-12-26 10:49:15 +03:00
Sercan Yemen	ca0f46b414	Fix: Scroll doesn't propagate by default (PerfectScrollbar)	2017-12-26 10:48:58 +03:00
Sercan Yemen	643a129a46	Merge branch 'master' into skeleton	2017-12-21 10:06:16 +03:00
Sercan Yemen	528fa31df6	Fixed: (Firefox) Navbar logo doesn't show when navbar collapsed	2017-12-21 10:04:56 +03:00
Sercan Yemen	abfb2a6706	Fixed: Mail Compose dialog responsive issues + Added Show/Hide CC & BCC fields toggle button	2017-12-19 12:21:22 +03:00
Sercan Yemen	b1ab11393e	Fix: (Ecommerce) Orders and Products tables not scrolling when custom scrollbars disabled	2017-12-19 10:27:33 +03:00
Sercan Yemen	de16f4f866	Merge branch 'master' into skeleton	2017-12-18 12:25:56 +03:00
Sercan Yemen	786883eb10	Updated season images + Fixed e-commerce app images + Stop animations in mail-ngrx app	2017-12-18 12:24:47 +03:00
Sercan Yemen	415d7cebfa	Skeleton updates	2017-12-14 16:20:52 +03:00
Sercan Yemen	f7d1995f63	Merge branch 'master' into skeleton	2017-12-14 16:06:32 +03:00
Sercan Yemen	e477f797d0	Updated Material Moment Adapter package	2017-12-14 16:06:07 +03:00
Sercan Yemen	3741abc063	Skeleton package updates	2017-12-14 16:03:34 +03:00
Sercan Yemen	54ccdd7de2	Merge branch 'master' into skeleton	2017-12-14 16:01:09 +03:00
Sercan Yemen	fb196c3864	Angular & Angular Material versions updated	2017-12-14 15:51:09 +03:00
mustafahlvc	5cf44962fc	(Mail) back arrow visibility updated for responsive	2017-12-14 12:27:08 +03:00
mustafahlvc	06b0c3775a	(Mail-ngrx) missing deSelectCurrentFunction() added to mail.component, back arrow visibility updated for responsive	2017-12-14 12:25:48 +03:00
mustafahlvc	26690990f0	(Mail-ngrx) currentMail fixes on html	2017-12-14 11:52:53 +03:00
mustafahlvc	377092d9ec	(Mail-ngrx) unread, selected class added for mail list item	2017-12-14 11:10:35 +03:00
mustafahlvc	abede386c8	(Mail-ngrx) Ngrx version of Mail App added.	2017-12-12 22:31:50 +03:00
Sercan Yemen	242feaa169	Updated Angular to 5.0.1 + Updated Angular Material to 5.0.0 stable + Install the ngx-dnd package from its original location + Updated various other packages + Increased the Fuse version	2017-12-08 10:34:39 +03:00
Sercan Yemen	7c2494a82c	Fixed: Shortcut items duplicates on search in some cases	2017-12-08 10:31:39 +03:00
Sercan Yemen	5c2e717a40	Make sure the nav item has children before trying to get them + Added LICENSE file + Renamed the KnowledgeBase demo module	2017-12-08 09:34:30 +03:00
Sercan Yemen	6ae0a9760d	Fix the missing backgrounds + Increased the shadow weight of the content on Auth, Coming Soon and Maintenance pages	2017-12-06 14:39:24 +03:00
Sercan Yemen	2a10f3e443	Moved the navigation.model.ts into its own folder + Added support for translations in nav items + Added badge support for collapsable nav items + Initialize the navigation from app.component rather then navigation.service	2017-12-06 14:10:48 +03:00
Sercan Yemen	db7a00440c	Re-activated mail search + Small formatting in mail translation	2017-12-06 14:09:31 +03:00
Sercan Yemen	0e1c589399	Use absolute paths for importing fuse.scss	2017-12-06 11:40:43 +03:00
Sercan Yemen	2f419b1af5	Removed unused HttpModule import	2017-12-06 11:40:16 +03:00
Sercan Yemen	effd3cefcb	Scrumboard and Contacts app dialogs responsive fixes	2017-12-06 11:35:58 +03:00
Sercan Yemen	21fd488a8e	ngx-color-picker style adjustments + Calendar event form responsive fixes	2017-12-06 11:26:57 +03:00
Sercan Yemen	37a5c69269	Removed Google Calendar images as they are no longer available freely from Google	2017-12-06 10:34:40 +03:00
Sercan Yemen	8b2e6b95b1	Merge branch 'master' into skeleton	2017-11-30 15:56:00 +03:00
Sercan Yemen	9f440b1bf2	Some code inspection fixes	2017-11-30 15:55:00 +03:00
Sercan Yemen	a65f61cce4	Form Stepper examples + Simplified the mat-select style + Further simplified the mat-select in dashboard widgets	2017-11-30 15:37:32 +03:00
Sercan Yemen	e86cea1e73	Merge branch 'master' into skeleton	2017-11-30 10:38:03 +03:00
Sercan Yemen	0d8fe0be72	Trigger expand/collapse of the navigation on ngOnInit to update the active item	2017-11-30 10:37:35 +03:00
Sercan Yemen	b81638690e	Merge branch 'master' into skeleton	2017-11-30 10:23:19 +03:00
Sercan Yemen	2bbc90af64	Perfect scrollbar shouldn't be destroyed if it's not available + Print media css classes updated to hide the perfect scrollbars	2017-11-30 10:22:18 +03:00
Sercan Yemen	ad21d9fed5	Further improvements to Auth pages	2017-11-30 10:21:22 +03:00
Sercan Yemen	4c6ef29e20	Fixed: Behavior Subject must be array	2017-11-28 10:48:52 +03:00
Sercan Yemen	a74c5108fd	Fixed: Couple small issues with Auth forms Added custom validator for Password Matching to Register forms	2017-11-28 10:42:41 +03:00
				`@@ -0,0 +1 @@`
				`https://themeforest.net/licenses/terms/regular`