UI fixes

src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs

@@ -119,7 +119,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
             var response = new ContentsDto
             {
                 Total = result.Total,
-                Items = result.Take(200).Select(item => SimpleMapper.Map(item, new ContentDto())).ToArray()
+                Items = result.Take(200).Select(item => SimpleMapper.Map(item, new ContentDto { Data = item.Data })).ToArray()
             };
 
             Response.Headers["Surrogate-Key"] = string.Join(" ", response.Items.Select(x => x.Id));
@@ -148,7 +148,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
         {
             var content = await contentQuery.FindContentAsync(App, name, User, id);
 
-            var response = SimpleMapper.Map(content, new ContentDto());
+            var response = SimpleMapper.Map(content, new ContentDto { Data = content.Data });
 
             Response.Headers["ETag"] = content.Version.ToString();
             Response.Headers["Surrogate-Key"] = content.Id.ToString();
@@ -179,7 +179,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
         {
             var content = await contentQuery.FindContentAsync(App, name, User, id, version);
 
-            var response = SimpleMapper.Map(content, new ContentDto());
+            var response = SimpleMapper.Map(content, new ContentDto { Data = content.Data });
 
             Response.Headers["ETag"] = content.Version.ToString();
             Response.Headers["Surrogate-Key"] = content.Id.ToString();

src/Squidex/Config/Domain/EntitiesServices.cs

@@ -60,6 +60,9 @@ namespace Squidex.Config.Domain
             services.AddSingletonAs<ContentQueryService>()
                 .As<IContentQueryService>();
 
+            services.AddSingletonAs<ContentVersionLoader>()
+                .As<IContentVersionLoader>();
+
             services.AddSingletonAs<AppHistoryEventsCreator>()
                 .As<IHistoryEventsCreator>();
 

src/Squidex/app/features/content/pages/content/content-page.component.ts

@@ -153,7 +153,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
         if (this.content) {
             this.contentsState.loadVersion(this.content, version)
                 .subscribe(dto => {
-                    if (this.content.version.value !== version.toString()) {
+                    if (this.content.version.value !== version.value) {
                         this.contentVersion = version;
                     } else {
                         this.contentVersion = null;

src/Squidex/app/shared/state/contents.state.ts

@@ -348,7 +348,7 @@ export abstract class ContentsStateBase extends State<Snapshot> {
     }
 
     public loadVersion(content: ContentDto, version: Version): Observable<Versioned<any>> {
-        return this.contentsService.getVersionData(this.appName, this.schemaName, content.id, new Version(version.toString()))
+        return this.contentsService.getVersionData(this.appName, this.schemaName, content.id, version)
             .notify(this.dialogs);
     }
 

src/Squidex/app/theme/_bootstrap.scss

@@ -56,7 +56,7 @@
     }
 
     .alert-link {
-        color: $color-dark-foreground;
+        color: $color-dark-foreground !important;
         font-size: inherit;
         font-weight: normal;
         text-decoration: underline;

src/Squidex/app/theme/_panels.scss

@@ -124,7 +124,9 @@
         }
 
         a {
-            color: $color-dark-foreground;
+            & {
+                color: $color-dark-foreground !important;
+            }
 
             &,
             &:hover {