mirror of
https://github.com/richard-loafle/fuse-angular.git
synced 2025-01-10 12:35:07 +00:00
Small fixes for todo, mail, projects-dashboard app, ie suppport etc..
This commit is contained in:
parent
e83e0ff07b
commit
faebddd114
|
@ -1,4 +1,4 @@
|
||||||
<div class="fuse-search-bar" [ngClass]="{'expanded':!collapsed}" fxLayout="row" fxLayoutAlign="start center" fxFlex>
|
<div class="fuse-search-bar" [ngClass]="{'expanded':!collapsed}" fxLayout="row" fxLayoutAlign="start center" fxFlex="0 1 auto">
|
||||||
|
|
||||||
<label for="fuse-search-bar-input">
|
<label for="fuse-search-bar-input">
|
||||||
<button md-icon-button class="fuse-search-bar-expander" aria-label="Expand Search Bar" (click)="expand()"
|
<button md-icon-button class="fuse-search-bar-expander" aria-label="Expand Search Bar" (click)="expand()"
|
||||||
|
|
|
@ -35,6 +35,7 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
|
||||||
left: 0;
|
left: 0;
|
||||||
height: $carded-header-height;
|
height: $carded-header-height;
|
||||||
background-image: $top-bg-image;
|
background-image: $top-bg-image;
|
||||||
|
background-size: cover;
|
||||||
|
|
||||||
@include media-breakpoint('sm') {
|
@include media-breakpoint('sm') {
|
||||||
height: $carded-header-height-sm;
|
height: $carded-header-height-sm;
|
||||||
|
@ -273,8 +274,9 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
|
|
||||||
// Top bg
|
// Top bg
|
||||||
.header {
|
> .header {
|
||||||
background-image: $top-bg-image;
|
background-image: $top-bg-image;
|
||||||
|
background-size: cover;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fullwidth
|
// Fullwidth
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.toolbar {
|
.toolbar {
|
||||||
|
|
||||||
.toolbar-separator {
|
.toolbar-separator {
|
||||||
height: calc(100% - 16px);
|
height: 48px;
|
||||||
width: 1px;
|
width: 1px;
|
||||||
border-right: 1px solid rgba(0, 0, 0, 0.12);
|
border-right: 1px solid rgba(0, 0, 0, 0.12);
|
||||||
margin: 0 12px;
|
margin: 0 12px;
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
<form [formGroup]="userForm" fxLayout="column">
|
<form [formGroup]="userForm" fxLayout="column">
|
||||||
|
|
||||||
<md-input-container class="mb-24" fxFlex>
|
<md-input-container class="mb-24" fxFlex="0 1 auto">
|
||||||
<textarea mdInput placeholder="Mood" name="mood"
|
<textarea mdInput placeholder="Mood" name="mood"
|
||||||
formControlName="mood" rows="3"></textarea>
|
formControlName="mood" rows="3"></textarea>
|
||||||
</md-input-container>
|
</md-input-container>
|
||||||
|
|
|
@ -702,7 +702,7 @@
|
||||||
|
|
||||||
<div class="pl-16 pr-8 py-16" fxLayout="row" fxLayoutAlign="space-between center">
|
<div class="pl-16 pr-8 py-16" fxLayout="row" fxLayoutAlign="space-between center">
|
||||||
|
|
||||||
<div class="h3">{{dateNow | date: 'EEEE'}}, {{dateNow | date: 'h'}}:{{dateNow | date: 'm'}}:{{dateNow | date: 'ss'}}</div>
|
<div class="h3">{{dateNow | date: 'EEEE, h:m:ss'}}</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button md-icon-button [mdMenuTriggerFor]="moreMenu" aria-label="more">
|
<button md-icon-button [mdMenuTriggerFor]="moreMenu" aria-label="more">
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
<!-- CONTENT TOOLBAR -->
|
<!-- CONTENT TOOLBAR -->
|
||||||
<div class="toolbar px-24 py-8">
|
<div class="toolbar px-24 py-8">
|
||||||
|
|
||||||
<div *ngIf="!currentMail">
|
<div fxFlex="row" fxLayoutAlign="start center">
|
||||||
<md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedMails"
|
<md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedMails"
|
||||||
[indeterminate]="isIndeterminate"></md-checkbox>
|
[indeterminate]="isIndeterminate"></md-checkbox>
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@
|
||||||
</md-menu>
|
</md-menu>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="currentMail">
|
<div *ngIf="currentMail" fxHide.gt-lg>
|
||||||
<button md-icon-button (click)="deSelectCurrentMail()">
|
<button md-icon-button (click)="deSelectCurrentMail()">
|
||||||
<md-icon>arrow_back</md-icon>
|
<md-icon>arrow_back</md-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -36,14 +36,14 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy
|
||||||
// Subscribe to update the current todo
|
// Subscribe to update the current todo
|
||||||
this.onCurrentTodoChanged =
|
this.onCurrentTodoChanged =
|
||||||
this.todoService.onCurrentTodoChanged
|
this.todoService.onCurrentTodoChanged
|
||||||
.subscribe(todo => {
|
.subscribe(([todo, formType]) => {
|
||||||
|
|
||||||
|
if ( todo && formType === 'edit' )
|
||||||
|
{
|
||||||
this.formType = 'edit';
|
this.formType = 'edit';
|
||||||
|
|
||||||
this.todo = todo;
|
this.todo = todo;
|
||||||
|
|
||||||
if ( this.todo )
|
|
||||||
{
|
|
||||||
this.todoForm = this.createTodoForm();
|
this.todoForm = this.createTodoForm();
|
||||||
|
|
||||||
this.onFormChange = this.todoForm.valueChanges
|
this.onFormChange = this.todoForm.valueChanges
|
||||||
|
@ -70,6 +70,7 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy
|
||||||
this.formType = 'new';
|
this.formType = 'new';
|
||||||
this.todoForm = this.createTodoForm();
|
this.todoForm = this.createTodoForm();
|
||||||
this.focusTitleField();
|
this.focusTitleField();
|
||||||
|
this.todoService.onCurrentTodoChanged.next([this.todo, 'new']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
<!-- CONTENT TOOLBAR -->
|
<!-- CONTENT TOOLBAR -->
|
||||||
<div class="toolbar px-24 py-8">
|
<div class="toolbar px-24 py-8">
|
||||||
<div *ngIf="!currentTodo">
|
<div fxFlex="row" fxLayoutAlign="start center">
|
||||||
<md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedTodos"
|
<md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedTodos"
|
||||||
[indeterminate]="isIndeterminate"></md-checkbox>
|
[indeterminate]="isIndeterminate"></md-checkbox>
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
</md-menu>
|
</md-menu>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="currentTodo">
|
<div *ngIf="currentTodo" fxHide.gt-lg>
|
||||||
<button md-icon-button (click)="deSelectCurrentTodo()">
|
<button md-icon-button (click)="deSelectCurrentTodo()">
|
||||||
<md-icon>arrow_back</md-icon>
|
<md-icon>arrow_back</md-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -62,7 +62,7 @@ export class FuseTodoComponent implements OnInit, OnDestroy
|
||||||
|
|
||||||
this.onCurrentTodoChanged =
|
this.onCurrentTodoChanged =
|
||||||
this.todoService.onCurrentTodoChanged
|
this.todoService.onCurrentTodoChanged
|
||||||
.subscribe(currentTodo => {
|
.subscribe(([currentTodo, formType]) => {
|
||||||
if ( !currentTodo )
|
if ( !currentTodo )
|
||||||
{
|
{
|
||||||
this.currentTodo = null;
|
this.currentTodo = null;
|
||||||
|
@ -76,7 +76,7 @@ export class FuseTodoComponent implements OnInit, OnDestroy
|
||||||
|
|
||||||
deSelectCurrentTodo()
|
deSelectCurrentTodo()
|
||||||
{
|
{
|
||||||
this.todoService.onCurrentTodoChanged.next(null);
|
this.todoService.onCurrentTodoChanged.next([null, null]);
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy()
|
ngOnDestroy()
|
||||||
|
|
|
@ -31,7 +31,7 @@ export class TodoService implements Resolve<any>
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private http: Http,
|
private http: Http,
|
||||||
private location: Location
|
private location: Location // Set current todo
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.selectedTodos = [];
|
this.selectedTodos = [];
|
||||||
|
@ -320,7 +320,7 @@ export class TodoService implements Resolve<any>
|
||||||
return todo.id === id;
|
return todo.id === id;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.onCurrentTodoChanged.next(this.currentTodo);
|
this.onCurrentTodoChanged.next([this.currentTodo, 'edit']);
|
||||||
|
|
||||||
const tagHandle = this.routeParams.tagHandle,
|
const tagHandle = this.routeParams.tagHandle,
|
||||||
filterHandle = this.routeParams.filterHandle;
|
filterHandle = this.routeParams.filterHandle;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user