Using Fluid instead of DotLiquid (#823)

Orchard.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26505.0
+VisualStudioVersion = 15.0.26606.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OrchardCore.Modules.Cms", "OrchardCore.Modules.Cms", "{90030E85-0C4F-456F-B879-443E8A3F220D}"
 EndProject
@@ -251,8 +251,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orchard.Tokens.Content.Abst
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Logging.NLog", "src\OrchardCore\Orchard.Logging.NLog\Orchard.Logging.NLog.csproj", "{00677E44-3048-4BAA-8F97-B577CC0EB788}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Liquid.Core", "src\OrchardCore\Orchard.Liquid.Core\Orchard.Liquid.Core.csproj", "{68980808-5759-40EF-9A12-B3478D9F5E22}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Queries", "src\OrchardCore.Modules\Orchard.Queries\Orchard.Queries.csproj", "{4FC00B36-DF0A-400F-8E1A-E700B5D58F98}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Liquid.Abstractions", "src\OrchardCore\Orchard.Liquid.Abstractions\Orchard.Liquid.Abstractions.csproj", "{2DF44392-8882-46B1-8061-61DDBCA358BD}"
@@ -719,18 +717,14 @@ Global
 		{4FC00B36-DF0A-400F-8E1A-E700B5D58F98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FC00B36-DF0A-400F-8E1A-E700B5D58F98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FC00B36-DF0A-400F-8E1A-E700B5D58F98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78F13261-B843-4590-8DD5-E9491874D0CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78F13261-B843-4590-8DD5-E9491874D0CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78F13261-B843-4590-8DD5-E9491874D0CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78F13261-B843-4590-8DD5-E9491874D0CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68980808-5759-40EF-9A12-B3478D9F5E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68980808-5759-40EF-9A12-B3478D9F5E22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68980808-5759-40EF-9A12-B3478D9F5E22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68980808-5759-40EF-9A12-B3478D9F5E22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2DF44392-8882-46B1-8061-61DDBCA358BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DF44392-8882-46B1-8061-61DDBCA358BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2DF44392-8882-46B1-8061-61DDBCA358BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DF44392-8882-46B1-8061-61DDBCA358BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78F13261-B843-4590-8DD5-E9491874D0CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78F13261-B843-4590-8DD5-E9491874D0CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78F13261-B843-4590-8DD5-E9491874D0CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78F13261-B843-4590-8DD5-E9491874D0CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8973BF9-4F56-4A59-9153-72BEDB6AB269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F8973BF9-4F56-4A59-9153-72BEDB6AB269}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F8973BF9-4F56-4A59-9153-72BEDB6AB269}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -887,9 +881,8 @@ Global
 		{677113F9-C548-4EB8-B248-E03BF967FA22} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{00677E44-3048-4BAA-8F97-B577CC0EB788} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{4FC00B36-DF0A-400F-8E1A-E700B5D58F98} = {90030E85-0C4F-456F-B879-443E8A3F220D}
-		{78F13261-B843-4590-8DD5-E9491874D0CD} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
-		{68980808-5759-40EF-9A12-B3478D9F5E22} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{2DF44392-8882-46B1-8061-61DDBCA358BD} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
+		{78F13261-B843-4590-8DD5-E9491874D0CD} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{F8973BF9-4F56-4A59-9153-72BEDB6AB269} = {90030E85-0C4F-456F-B879-443E8A3F220D}
 		{F621B369-15FD-4923-98AD-17740C24CD5C} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{AEB44D2A-1493-4550-8B13-EB611B1FB12C} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}

src/OrchardCore.Modules/Orchard.ContentPreview/Content/Scripts/contentpreview.edit.js

@@ -177,9 +177,14 @@ $(function () {
                 .fail(function (data) {
                     $(contentPreviewContent).empty();
                     $(previewErrors).empty().show();
-                    data.responseJSON.errors.forEach(function (error) {
-                        $(previewErrors).append('<div>' + error + '</div>')
-                    });
+                    if (data.responseJSON && data.responseJSON.errors) {
+                        responseJSON.errors.forEach(function (error) {
+                            $(previewErrors).append('<div>' + error + '</div>')
+                        });
+                    }
+                    else {
+                        $(previewErrors).append('<div>' + $('#unknownError').data('msg') + '</div>')
+                    }
                 })
                 .always(function () {
                     rendering = false;

src/OrchardCore.Modules/Orchard.ContentPreview/Views/ContentPreview.Container.cshtml

@@ -7,4 +7,5 @@
     </nav>
     <div id="contentPreviewErrors" class="alert alert-danger"></div>
     <div id="contentPreviewContent"></div>
+    <div id="unknownError" data-msg="@T["Unknown error"]"></div>
 </div>

src/OrchardCore.Modules/Orchard.ContentPreview/Views/Preview/Index.cshtml

@@ -1 +1 @@
-@await DisplayAsync(Model)
+@await DisplayAsync(Model)