ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
richard-loafle 2020-01-23 12:42:33 +09:00
parent ddb52c3fb4
commit 91fcf7f2e5
1 changed files with 26 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
View File

@ -450,65 +450,45 @@
</mat-menu>
<mat-menu #informationMenu="matMenu">
<<<<<<< HEAD
<ng-template matMenuContent>
<div
class="version-info-container menu-item"
(click)="$event.stopPropagation()"
>
<div class="version-info-now">
<span class="version-info-item">
{{ 'information.installedVersion' | translate }}:<span class="info-content">{{ appVersion }}</span>
{{ 'information.installedVersion' | translate }}:<span
class="info-content"
>{{ appVersion }}</span
>
</span>
</div>
<div *ngIf="checkingUpdate" class="version-info-newest">
<div *ngIf="checkingUpdateIsProcessing">
<span class="version-info-item">
{{ 'information.checkForUpdatesInProgress' | translate }}
<span class="info-content"> <mat-spinner *ngIf="checkingUpdate && checkingUpdateIsProcessing" diameter="20" strokeWidth="1"></mat-spinner></span>
</span>
</div>
<div *ngIf="!checkingUpdateIsProcessing" style="display: flex;">
<span class="version-info-item">
{{ 'information.latestVersion' | translate }}:<span class="info-content">{{
checkingUpdateAppVersion
}}</span>
</span>
<span class="version-info-button">
<button *ngIf="checkingUpdateIsExist" mat-flat-button
class="mat-primary" (click)="onClickApplyUpdate($event)">{{ 'information.applyUpdates' | translate }}</button>
=======
<ng-template matMenuContent>
<div
class="version-info-container menu-item"
(click)="$event.stopPropagation()"
>
<div>
<span>
{{ 'information.installedVersion' | translate }}:{{ appVersion }}
>>>>>>> 86c2a7cb2a2195023425b1653f1cc8472b09a8d9
</span>
</div>
<div *ngIf="checkingUpdate">
<div *ngIf="checkingUpdateIsProcessing" style="display: flex;">
<span class="info-content">
<mat-spinner
*ngIf="checkingUpdate && checkingUpdateIsProcessing"
diameter="20"
strokeWidth="1"
></mat-spinner>
{{ 'information.checkForUpdatesInProgress' | translate }}
</span>
</span>
</div>
<div *ngIf="!checkingUpdateIsProcessing" style="display: flex;">
<span>
{{ 'information.latestVersion' | translate }}:{{
checkingUpdateAppVersion
}}
<span class="version-info-item">
{{ 'information.latestVersion' | translate }}:<span
class="info-content"
>{{ checkingUpdateAppVersion }}</span
>
</span>
<span>
<span class="version-info-button">
<button
*ngIf="checkingUpdateIsExist"
mat-button
mat-flat-button
class="mat-primary"
(click)="onClickApplyUpdate($event)"
>
{{ 'information.applyUpdates' | translate }}