Use material tooltip allover
parent
44a689a359
commit
2d0dd0f000
|
@ -54,7 +54,7 @@
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<span class="glyphicon glyphicon-trash trash" title="Löschen" (click)="deleteUser(user)"></span>
|
<span class="glyphicon glyphicon-trash trash" matTooltip="Löschen" (click)="deleteUser(user)"></span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
</mat-button-toggle-group>
|
</mat-button-toggle-group>
|
||||||
<button mat-icon-button class="add-btn">
|
<button mat-icon-button class="add-btn">
|
||||||
<mat-icon svgIcon="{{addButton.svgIcon}}"
|
<mat-icon svgIcon="{{addButton.svgIcon}}"
|
||||||
title="{{addButton.tooltip}}"
|
matTooltip="{{addButton.tooltip}}"
|
||||||
(click)="add()"></mat-icon>
|
(click)="add()">
|
||||||
|
</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
[style.max-width]="imgStyle.width"
|
[style.max-width]="imgStyle.width"
|
||||||
[style.margin-top]="imgStyle.marginTop"
|
[style.margin-top]="imgStyle.marginTop"
|
||||||
class="decoration-list-preview">
|
class="decoration-list-preview">
|
||||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span>
|
<span (click)="delete(); $event.stopPropagation()" matTooltip="Löschen" class="glyphicon glyphicon-trash trash"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
<div class="col-xs-4">
|
<div class="col-xs-4">
|
||||||
<img src="{{imageSrc}}" class="rank-list-preview">
|
<img src="{{imageSrc}}" class="rank-list-preview">
|
||||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span>
|
<span (click)="delete(); $event.stopPropagation()" matTooltip="Löschen" class="glyphicon glyphicon-trash trash"></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
<td>
|
<td>
|
||||||
<textarea style="width:100%;"
|
<textarea style="width:100%;"
|
||||||
rows="3"
|
rows="3"
|
||||||
title="reason"
|
|
||||||
#reason>{{award.reason}}</textarea>
|
#reason>{{award.reason}}</textarea>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -44,7 +43,6 @@
|
||||||
<td>
|
<td>
|
||||||
<textarea style="width: 100%;"
|
<textarea style="width: 100%;"
|
||||||
rows="3"
|
rows="3"
|
||||||
title="rejectReason"
|
|
||||||
placeholder="Begründung für Ablehnung (optional)"
|
placeholder="Begründung für Ablehnung (optional)"
|
||||||
#rejectReason></textarea>
|
#rejectReason></textarea>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
<td>
|
<td>
|
||||||
<textarea style="width: 100%;"
|
<textarea style="width: 100%;"
|
||||||
rows="3"
|
rows="3"
|
||||||
title="rejectReason"
|
|
||||||
placeholder="Begründung für Ablehnung (optional)"
|
placeholder="Begründung für Ablehnung (optional)"
|
||||||
#rejectReason></textarea>
|
#rejectReason></textarea>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -4,15 +4,16 @@ import {ShowErrorComponent} from './common/show-error/show-error.component';
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {ListFilterComponent} from './common/user-interface/list-filter/list-filter.component';
|
import {ListFilterComponent} from './common/user-interface/list-filter/list-filter.component';
|
||||||
import {SearchFieldComponent} from './common/user-interface/search-field/search-field.component';
|
import {SearchFieldComponent} from './common/user-interface/search-field/search-field.component';
|
||||||
import {MatButtonToggleModule} from '@angular/material';
|
import {MatButtonToggleModule, MatTooltipModule} from '@angular/material';
|
||||||
import {MatButtonModule} from '@angular/material/button';
|
import {MatButtonModule} from '@angular/material/button';
|
||||||
import {MatIconModule} from '@angular/material/icon';
|
import {MatIconModule} from '@angular/material/icon';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [ShowErrorComponent, ListFilterComponent, SearchFieldComponent],
|
declarations: [ShowErrorComponent, ListFilterComponent, SearchFieldComponent],
|
||||||
imports: [CommonModule, FormsModule, ReactiveFormsModule, MatButtonToggleModule, MatButtonModule, MatIconModule],
|
imports: [CommonModule, FormsModule, ReactiveFormsModule, MatButtonToggleModule, MatButtonModule, MatIconModule,
|
||||||
|
MatTooltipModule],
|
||||||
exports: [FormsModule, ReactiveFormsModule, MatButtonToggleModule, MatButtonModule, MatIconModule, ShowErrorComponent,
|
exports: [FormsModule, ReactiveFormsModule, MatButtonToggleModule, MatButtonModule, MatIconModule, ShowErrorComponent,
|
||||||
ListFilterComponent, SearchFieldComponent],
|
ListFilterComponent, SearchFieldComponent, MatTooltipModule],
|
||||||
})
|
})
|
||||||
export class SharedModule {
|
export class SharedModule {
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
<div class="col-xs-4">
|
<div class="col-xs-4">
|
||||||
<img src="{{imageSrc}}" height="50px" class="squad-list-preview">
|
<img src="{{imageSrc}}" height="50px" class="squad-list-preview">
|
||||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span>
|
<span (click)="delete(); $event.stopPropagation()" matTooltip="Löschen" class="glyphicon glyphicon-trash trash"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
<ngx-datatable-column [width]="valueColWidth" prop="{{attributeMap.prop}}">
|
<ngx-datatable-column [width]="valueColWidth" prop="{{attributeMap.prop}}">
|
||||||
<ng-template ngx-datatable-header-template let-sort="sortFn">
|
<ng-template ngx-datatable-header-template let-sort="sortFn">
|
||||||
<span class="datatable-header-cell-wrapper">
|
<span class="datatable-header-cell-wrapper">
|
||||||
<span class="datatable-header-cell-label text-truncate" title="{{attributeMap.head}}" (click)="sort()">
|
<span class="datatable-header-cell-label text-truncate" matTooltip="{{attributeMap.head}}" (click)="sort()">
|
||||||
<img src="../../../../assets/scoreboard/{{attributeMap.prop}}.png" alt="{{attributeMap.head}}">
|
<img src="../../../../assets/scoreboard/{{attributeMap.prop}}.png" alt="{{attributeMap.head}}">
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
<div *ngIf="loginService.hasPermission(3)"
|
<div *ngIf="loginService.hasPermission(3)"
|
||||||
class="interact-ico-container">
|
class="interact-ico-container">
|
||||||
<span class="glyphicon glyphicon-edit" (click)="edit(); $event.stopPropagation()" title="Bearbeiten"></span>
|
<span class="glyphicon glyphicon-edit" (click)="edit(); $event.stopPropagation()" matTooltip="Bearbeiten"></span>
|
||||||
<span class="glyphicon glyphicon-trash" (click)="delete(); $event.stopPropagation()" title="Löschen"></span>
|
<span class="glyphicon glyphicon-trash" (click)="delete(); $event.stopPropagation()" matTooltip="Löschen"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -15,10 +15,10 @@
|
||||||
{{campaign.title}}
|
{{campaign.title}}
|
||||||
</mat-panel-title>
|
</mat-panel-title>
|
||||||
<mat-panel-description class="war-interaction-panel" *ngIf="loginService.hasPermission(3)">
|
<mat-panel-description class="war-interaction-panel" *ngIf="loginService.hasPermission(3)">
|
||||||
<span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
|
<span (click)="deleteCampaign(campaign); $event.stopPropagation()" matTooltip="Löschen"
|
||||||
class="glyphicon glyphicon-trash trash">
|
class="glyphicon glyphicon-trash trash">
|
||||||
</span>
|
</span>
|
||||||
<span (click)="editCampaign(campaign); $event.stopPropagation()" title="Bearbeiten"
|
<span (click)="editCampaign(campaign); $event.stopPropagation()" matTooltip="Bearbeiten"
|
||||||
class="glyphicon glyphicon-edit trash"
|
class="glyphicon glyphicon-edit trash"
|
||||||
style="padding-right: 10px;">
|
style="padding-right: 10px;">
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -13,9 +13,9 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-4">
|
<div class="col-sm-4">
|
||||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen"
|
<span (click)="delete(); $event.stopPropagation()" matTooltip="Löschen"
|
||||||
class="glyphicon glyphicon-trash trash pull-right"></span>
|
class="glyphicon glyphicon-trash trash pull-right"></span>
|
||||||
<span (click)="award(); $event.stopPropagation()" title="Auszeichnungen" class="icon-award pull-right"></span>
|
<span (click)="award(); $event.stopPropagation()" matTooltip="Auszeichnungen" class="icon-award pull-right"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue