Browse Source

Protected improvements.

pull/572/head
Sebastian 5 years ago
parent
commit
b279ee9b8e
  1. 2
      backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs
  2. 2
      frontend/app/framework/angular/forms/progress-bar.component.ts
  3. 4
      frontend/app/shared/components/assets/asset.component.html
  4. 10
      frontend/app/shared/components/assets/asset.component.scss

2
backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs

@ -134,6 +134,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries
AddProperty(nameof(IAssetEntity.FileName), JsonObjectType.String);
AddProperty(nameof(IAssetEntity.FileSize), JsonObjectType.Integer);
AddProperty(nameof(IAssetEntity.FileVersion), JsonObjectType.Integer);
AddProperty(nameof(IAssetEntity.IsProtected), JsonObjectType.Boolean);
AddProperty(nameof(IAssetEntity.LastModified), JsonObjectType.String, JsonFormatStrings.DateTime);
AddProperty(nameof(IAssetEntity.LastModifiedBy), JsonObjectType.String);
AddProperty(nameof(IAssetEntity.Metadata), JsonObjectType.None);
@ -169,6 +170,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries
AddProperty(nameof(IAssetEntity.CreatedBy), EdmPrimitiveTypeKind.String);
AddProperty(nameof(IAssetEntity.FileHash), EdmPrimitiveTypeKind.String);
AddProperty(nameof(IAssetEntity.FileName), EdmPrimitiveTypeKind.String);
AddProperty(nameof(IAssetEntity.IsProtected), EdmPrimitiveTypeKind.Boolean);
AddProperty(nameof(IAssetEntity.FileSize), EdmPrimitiveTypeKind.Int64);
AddProperty(nameof(IAssetEntity.FileVersion), EdmPrimitiveTypeKind.Int64);
AddProperty(nameof(IAssetEntity.LastModified), EdmPrimitiveTypeKind.DateTimeOffset);

2
frontend/app/framework/angular/forms/progress-bar.component.ts

@ -12,7 +12,7 @@ import * as ProgressBar from 'progressbar.js';
selector: 'sqx-progress-bar',
styles: [`
:host ::ng-deep svg {
vertical-align: top
vertical-align: middle
}`
],
template: '',

4
frontend/app/shared/components/assets/asset.component.html

@ -74,6 +74,8 @@
<ng-container *ngIf="asset">
<div>
<div class="file-name truncate editable" (click)="edit()">
<i class="icon-lock" *ngIf="asset?.isProtected"></i>
{{asset.fileName}}
</div>
</div>
@ -108,6 +110,8 @@
<tr>
<td class="col-name">
<div class="file-name editable" (click)="edit()">
<i class="icon-lock" *ngIf="asset?.isProtected"></i>
{{asset.fileName}}
</div>
</td>

10
frontend/app/shared/components/assets/asset.component.scss

@ -111,6 +111,10 @@ $list-height: 2.25rem;
&-name {
line-height: 2rem;
i {
font-size: 80%;
}
}
&-tags {
@ -171,12 +175,6 @@ $list-height: 2.25rem;
}
}
.editable {
border-bottom: 1px solid transparent;
border-top: 0;
height: 2rem;
}
.table-items-row {
& {
height: $list-height + 2rem;

Loading…
Cancel
Save