From 77090f12c62155da1524a309fcd7ecec50d9d591 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 9 Nov 2019 21:27:59 +0000 Subject: [PATCH] Show prettyfied ATA IDENTIFY on delete and details. --- .../Areas/Admin/Views/Atas/Delete.cshtml | 15 ++++++--------- .../Areas/Admin/Views/Atas/Details.cshtml | 14 ++++---------- DiscImageChef.Server/Core/HtmlHelpers.cs | 12 ++++++++++++ 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 DiscImageChef.Server/Core/HtmlHelpers.cs diff --git a/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml index 43a23550..39414fcc 100644 --- a/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml +++ b/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml @@ -1,3 +1,5 @@ +@using DiscImageChef.Decoders.ATA +@using DiscImageChef.Server.Core @model DiscImageChef.CommonTypes.Metadata.Ata @{ @@ -35,16 +37,11 @@ }

Are you sure you want to delete this?

-

Ata

+

ATA IDENTIFY DEVICE / ATAPI IDENTIFY PACKET DEVICE - ID = @Model.Id


-
-
- @Html.DisplayNameFor(model => model.Identify) -
-
- @Html.DisplayFor(model => model.Identify) -
-
+ @Html.Raw(Html.EncodedMultiLineText(Identify.Prettify(Model.Identify))) +
+
Back to List diff --git a/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml index 519dea6e..37002096 100644 --- a/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml +++ b/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml @@ -1,3 +1,5 @@ +@using DiscImageChef.Decoders.ATA +@using DiscImageChef.Server.Core @model DiscImageChef.CommonTypes.Metadata.Ata @{ @@ -34,18 +36,10 @@ // ****************************************************************************/ }
-

Ata

+

ATA IDENTIFY DEVICE / ATAPI IDENTIFY PACKET DEVICE - ID = @Model.Id


-
-
- @Html.DisplayNameFor(model => model.Identify) -
-
- @Html.DisplayFor(model => model.Identify) -
-
+ @Html.Raw(Html.EncodedMultiLineText(Identify.Prettify(Model.Identify)))
- Edit Back to List
\ No newline at end of file diff --git a/DiscImageChef.Server/Core/HtmlHelpers.cs b/DiscImageChef.Server/Core/HtmlHelpers.cs new file mode 100644 index 00000000..6fd5695c --- /dev/null +++ b/DiscImageChef.Server/Core/HtmlHelpers.cs @@ -0,0 +1,12 @@ +using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace DiscImageChef.Server.Core +{ + public static class HtmlHelpers + { + public static string EncodedMultiLineText(this IHtmlHelper helper, string text) => + string.IsNullOrEmpty(text) ? string.Empty + : Regex.Replace(helper.Encode(text), " | | ", "
"); + } +} \ No newline at end of file