Fix display names for ASP.NET views.

This commit is contained in:
2019-11-24 19:09:57 +00:00
parent 371c7d3f3e
commit 453147da3d
60 changed files with 779 additions and 347 deletions

View File

@@ -349,6 +349,9 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
public IActionResult Find(int id, string manufacturer, string model, string revision, string bus) public IActionResult Find(int id, string manufacturer, string model, string revision, string bus)
{ {
if(model is null)
return NotFound();
var found = new FindReportModel var found = new FindReportModel
{ {
Id = id, Manufacturer = manufacturer, Model = model, Revision = revision, Id = id, Manufacturer = manufacturer, Model = model, Revision = revision,

View File

@@ -33,7 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
ATA IDENTIFY DEVICE responses <h4>ATA IDENTIFY DEVICE responses</h4>
<div> <div>
<a asp-action="CheckPrivate" class="btn btn-primary">Check private fields</a> <a asp-action="CheckPrivate" class="btn btn-primary">Check private fields</a>
<a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a> <a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a>
@@ -48,7 +48,7 @@ ATA IDENTIFY DEVICE responses
@Html.DisplayNameFor(model => model.IdentifyDevice.Value.Model) @Html.DisplayNameFor(model => model.IdentifyDevice.Value.Model)
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.IdentifyDevice.Value.FirmwareRevision) Firmware revision
</th> </th>
<th></th> <th></th>
</tr> </tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Block descriptors</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Commands</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>CompactDiscOffset</h4> <h4>Compact disc offset</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -34,6 +34,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<a asp-action="Update" class="btn btn-primary">Update from AccurateRip</a> <a asp-action="Update" class="btn btn-primary">Update from AccurateRip</a>
<h4>Compact Disc offsets</h4>
<table class="table" id="tblOffsets"> <table class="table" id="tblOffsets">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>DeviceStat</h4> <h4>Device statistic</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,7 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>DeviceStat</h4> <h4>Device statistic</h4>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Device statistics</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>Device</h4> <h4>Device report</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -34,7 +34,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<div> <div>
<h4>Device</h4> <h4>Device report</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -34,7 +34,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Device</h4> <h4>Device report</h4>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Device reports</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Filesystems</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Filters</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>FireWire</h4> <h4>FireWire registers</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,7 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>FireWire</h4> <h4>FireWire registers</h4>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">

View File

@@ -34,6 +34,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<a asp-action="Consolidate" class="btn btn-primary">Consolidate</a> <a asp-action="Consolidate" class="btn btn-primary">Consolidate</a>
<h4>FireWire registers</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>MediaFormat</h4> <h4>Media image format</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Media image formats</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Medias</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -1,3 +1,5 @@
@using DiscImageChef.Decoders.SCSI
@using DiscImageChef.Server.Core
@model DiscImageChef.CommonTypes.Metadata.Mmc @model DiscImageChef.CommonTypes.Metadata.Mmc
@{ @{
@@ -35,16 +37,9 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>Mmc</h4> <h4>SCSI CD-ROM capabilities page - ID = @Model.Id</h4>
<hr /> <hr />
<dl class="row"> @Html.Raw(Html.EncodedMultiLineText(Modes.PrettifyModePage_2A(Model.ModeSense2AData)))
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense2AData)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense2AData)
</dd>
</dl>
<form asp-action="Delete"> <form asp-action="Delete">
<input type="hidden" asp-for="Id" /> <input type="hidden" asp-for="Id" />
<a asp-action="Index" class="btn btn-primary">Back to List</a> <a asp-action="Index" class="btn btn-primary">Back to List</a>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<div> <div>
<h4>MMC FEATURES - ID = @Model.Id</h4> <h4>SCSI CD-ROM capabilities page - ID = @Model.Id</h4>
<hr /> <hr />
@Html.Raw(Html.EncodedMultiLineText(Modes.PrettifyModePage_2A(Model.ModeSense2AData))) @Html.Raw(Html.EncodedMultiLineText(Modes.PrettifyModePage_2A(Model.ModeSense2AData)))
</div> </div>

View File

@@ -34,6 +34,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<a asp-action="Clean" class="btn btn-danger">Clean</a> <a asp-action="Clean" class="btn btn-danger">Clean</a>
<h4>SCSI CD-ROM capabilities pages</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -34,7 +34,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<div> <div>
<h4>MmcFeatures</h4> <h4>MMC FEATURES</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>MMC FEATURES</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -1,3 +1,5 @@
@using DiscImageChef.Decoders.SecureDigital
@using DiscImageChef.Server.Core
@model DiscImageChef.CommonTypes.Metadata.MmcSd @model DiscImageChef.CommonTypes.Metadata.MmcSd
@{ @{
@@ -35,39 +37,86 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>MmcSd</h4> <h4>MultiMediaCard / SecureDigital registers</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> @if (Model.SCR != null)
@Html.DisplayNameFor(model => model.CID) {
</dt> if (Model.CID != null)
<dd class="col-sm-10"> {
@Html.DisplayFor(model => model.CID) <dt class="col-sm-2">
</dd> @Html.DisplayNameFor(model => model.CID)
<dt class="col-sm-2"> </dt>
@Html.DisplayNameFor(model => model.CSD) <dd class="col-sm-10">
</dt> @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyCID(Model.CID)))
<dd class="col-sm-10"> </dd>
@Html.DisplayFor(model => model.CSD) }
</dd> if (Model.CSD != null)
<dt class="col-sm-2"> {
@Html.DisplayNameFor(model => model.OCR) <dt class="col-sm-2">
</dt> @Html.DisplayNameFor(model => model.CSD)
<dd class="col-sm-10"> </dt>
@Html.DisplayFor(model => model.OCR) <dd class="col-sm-10">
</dd> @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyCSD(Model.CSD)))
<dt class="col-sm-2"> </dd>
@Html.DisplayNameFor(model => model.SCR) }
</dt> if (Model.OCR != null)
<dd class="col-sm-10"> {
@Html.DisplayFor(model => model.SCR) <dt class="col-sm-2">
</dd> @Html.DisplayNameFor(model => model.OCR)
<dt class="col-sm-2"> </dt>
@Html.DisplayNameFor(model => model.ExtendedCSD) <dd class="col-sm-10">
</dt> @Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifyOCR(Model.OCR)))
<dd class="col-sm-10"> </dd>
@Html.DisplayFor(model => model.ExtendedCSD) }
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SCR)
</dt>
<dd class="col-sm-10">
@Html.Raw(Html.EncodedMultiLineText(Decoders.PrettifySCR(Model.SCR)))
</dd>
}
else
{
if (Model.CID != null)
{
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.CID)
</dt>
<dd class="col-sm-10">
@Html.Raw(Html.EncodedMultiLineText(DiscImageChef.Decoders.MMC.Decoders.PrettifyCID(Model.CID)))
</dd>
}
if (Model.CSD != null)
{
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.CSD)
</dt>
<dd class="col-sm-10">
@Html.Raw(Html.EncodedMultiLineText(DiscImageChef.Decoders.MMC.Decoders.PrettifyCSD(Model.CSD)))
</dd>
}
if (Model.OCR != null)
{
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.OCR)
</dt>
<dd class="col-sm-10">
@Html.Raw(Html.EncodedMultiLineText(DiscImageChef.Decoders.MMC.Decoders.PrettifyOCR(Model.OCR)))
</dd>
}
if (Model.ExtendedCSD != null)
{
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ExtendedCSD)
</dt>
<dd class="col-sm-10">
@Html.Raw(Html.EncodedMultiLineText(DiscImageChef.Decoders.MMC.Decoders.PrettifyExtendedCSD(Model.ExtendedCSD)))
</dd>
}
}
</dl> </dl>
<form asp-action="Delete"> <form asp-action="Delete">
<input type="hidden" asp-for="Id" /> <input type="hidden" asp-for="Id" />

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<div> <div>
<h4>MmcSd</h4> <h4>MultiMediaCard / SecureDigital registers</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
@if (Model.SCR != null) @if (Model.SCR != null)

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>MultiMediaCard / SecureDigital registers</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Operating systems</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Partitioning schemes</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>Pcmcia</h4> <h4>PCMCIA data</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>PCMCIA data</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -3,10 +3,9 @@
@{ @{
ViewData["Title"] = "Delete"; ViewData["Title"] = "Delete";
} }
<h1>Delete</h1>
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>UploadedReport</h4> <h4>Uploaded report</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -3,7 +3,6 @@
@{ @{
ViewData["Title"] = "Details"; ViewData["Title"] = "Details";
} }
<h1>Details</h1>
<div> <div>
<h4>Uploaded report</h4> <h4>Uploaded report</h4>
<hr /> <hr />

View File

@@ -4,7 +4,6 @@
@{ @{
ViewData["Title"] = "Edit"; ViewData["Title"] = "Edit";
} }
<h1>Edit</h1>
<h4>Uploaded report</h4> <h4>Uploaded report</h4>
<hr /> <hr />
<div class="row"> <div class="row">

View File

@@ -3,7 +3,7 @@
@{ @{
ViewData["Title"] = "Index"; ViewData["Title"] = "Index";
} }
<h1>Index</h1> <h4>Uploaded reports</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>ScsiMode</h4> <h4>SCSI MODE SENSE response</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>SCSI MODE SENSE responses</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>SCSI MODE SENSE pages</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -1,3 +1,5 @@
@using DiscImageChef.Decoders.SCSI
@using DiscImageChef.Server.Core
@model DiscImageChef.CommonTypes.Metadata.Scsi @model DiscImageChef.CommonTypes.Metadata.Scsi
@{ @{
@@ -35,70 +37,9 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>Scsi</h4> <h4>SCSI INQUIRY - ID = @Model.Id</h4>
<hr /> <hr />
<dl class="row"> @Html.Raw(Html.EncodedMultiLineText(Inquiry.Prettify(Model.InquiryData)))
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.InquiryData)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.InquiryData)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SupportsModeSense6)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SupportsModeSense6)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SupportsModeSense10)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SupportsModeSense10)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SupportsModeSubpages)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SupportsModeSubpages)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense6Data)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense6Data)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense10Data)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense10Data)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense6CurrentData)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense6CurrentData)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense10CurrentData)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense10CurrentData)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense6ChangeableData)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense6ChangeableData)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense10ChangeableData)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense10ChangeableData)
</dd>
</dl>
<form asp-action="Delete"> <form asp-action="Delete">
<input type="hidden" asp-for="Id" /> <input type="hidden" asp-for="Id" />
<a asp-action="Index" class="btn btn-primary">Back to List</a> <a asp-action="Index" class="btn btn-primary">Back to List</a>

View File

@@ -34,7 +34,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
SCSI INQUIRY responses <h4>SCSI INQUIRY responses</h4>
<div> <div>
<a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a> <a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a>
</div> </div>
@@ -45,13 +45,13 @@ SCSI INQUIRY responses
@Html.DisplayNameFor(model => model.Id) @Html.DisplayNameFor(model => model.Id)
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Inquiry.Value.VendorIdentification) Vendor identification
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Inquiry.Value.ProductIdentification) Product identification
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Inquiry.Value.ProductRevisionLevel) Product revision level
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.SupportsModeSense6) @Html.DisplayNameFor(model => model.SupportsModeSense6)

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>Ssc</h4> <h4>SSC</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -36,6 +36,7 @@
<div> <div>
<a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a> <a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a>
</div> </div>
<h4>SSCs</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>SupportedDensity</h4> <h4>Supported density</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Supported densities</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -423,7 +423,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -437,7 +436,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -615,7 +613,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -629,7 +626,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -643,7 +639,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -657,7 +652,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -671,7 +665,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -685,7 +678,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -699,7 +691,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -713,7 +704,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -727,7 +717,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -741,7 +730,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -755,7 +743,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -769,7 +756,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -783,7 +769,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -797,7 +782,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -811,7 +795,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -825,7 +808,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -839,7 +821,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -853,7 +834,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -867,7 +847,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -881,7 +860,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -895,7 +873,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -909,7 +886,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -923,7 +899,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -937,7 +912,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -951,7 +925,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -965,7 +938,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -979,7 +951,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -993,7 +964,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1007,7 +977,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1021,7 +990,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1035,7 +1003,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1049,7 +1016,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1063,7 +1029,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1077,7 +1042,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1091,7 +1055,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1105,7 +1068,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1119,7 +1081,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1133,7 +1094,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1147,7 +1107,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1161,7 +1120,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1175,7 +1133,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1189,7 +1146,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1203,7 +1159,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1217,7 +1172,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1231,7 +1185,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1245,7 +1198,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1259,7 +1211,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1273,7 +1224,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1287,7 +1237,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1301,7 +1250,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1315,7 +1263,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1329,7 +1276,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1343,7 +1289,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1357,7 +1302,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1371,7 +1315,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1385,7 +1328,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1399,7 +1341,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1413,7 +1354,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1427,7 +1367,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1441,7 +1380,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1455,7 +1393,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1469,7 +1406,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1483,7 +1419,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -1497,7 +1432,6 @@
else else
{ {
@("<null>") @("<null>")
;
} }
</dd> </dd>
</dl> </dl>

View File

@@ -33,7 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>TestedMedia</h4> <h4>Tested media</h4>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">

View File

@@ -33,64 +33,65 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Tested media</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr>
<th>
@Html.DisplayNameFor(model => model.Manufacturer)
</th>
<th>
@Html.DisplayNameFor(model => model.Model)
</th>
<th>
@Html.DisplayNameFor(model => model.MediumTypeName)
</th>
<th>
@Html.DisplayNameFor(model => model.MediaIsRecognized)
</th>
<th>
@Html.DisplayNameFor(model => model.Blocks)
</th>
<th>
@Html.DisplayNameFor(model => model.BlockSize)
</th>
<th>
@Html.DisplayNameFor(model => model.LongBlockSize)
</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach (var item in Model)
{
<tr> <tr>
<td> <th>
@Html.DisplayFor(modelItem => item.Manufacturer) @Html.DisplayNameFor(model => model.Manufacturer)
</td> </th>
<td> <th>
@Html.DisplayFor(modelItem => item.Model) @Html.DisplayNameFor(model => model.Model)
</td> </th>
<td> <th>
@Html.DisplayFor(modelItem => item.MediumTypeName) @Html.DisplayNameFor(model => model.MediumTypeName)
</td> </th>
<td> <th>
@Html.DisplayFor(modelItem => item.MediaIsRecognized) @Html.DisplayNameFor(model => model.MediaIsRecognized)
</td> </th>
<td> <th>
@Html.DisplayFor(modelItem => item.Blocks) @Html.DisplayNameFor(model => model.Blocks)
</td> </th>
<td> <th>
@Html.DisplayFor(modelItem => item.BlockSize) @Html.DisplayNameFor(model => model.BlockSize)
</td> </th>
<td> <th>
@Html.DisplayFor(modelItem => item.LongBlockSize) @Html.DisplayNameFor(model => model.LongBlockSize)
</td> </th>
<td> <th></th>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
<a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
</td>
</tr> </tr>
} </thead>
</tbody> <tbody>
@foreach (var item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Manufacturer)
</td>
<td>
@Html.DisplayFor(modelItem => item.Model)
</td>
<td>
@Html.DisplayFor(modelItem => item.MediumTypeName)
</td>
<td>
@Html.DisplayFor(modelItem => item.MediaIsRecognized)
</td>
<td>
@Html.DisplayFor(modelItem => item.Blocks)
</td>
<td>
@Html.DisplayFor(modelItem => item.BlockSize)
</td>
<td>
@Html.DisplayFor(modelItem => item.LongBlockSize)
</td>
<td>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
<a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
</td>
</tr>
}
</tbody>
</table> </table>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>TestedSequentialMedia</h4> <h4>Tested sequential media</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">
@@ -80,18 +80,6 @@
<dd class="col-sm-10"> <dd class="col-sm-10">
@Html.DisplayFor(model => model.Model) @Html.DisplayFor(model => model.Model)
</dd> </dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense6Data)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense6Data)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ModeSense10Data)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ModeSense10Data)
</dd>
</dl> </dl>
<form asp-action="Delete"> <form asp-action="Delete">
<input type="hidden" asp-for="Id" /> <input type="hidden" asp-for="Id" />

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>Tested sequential media</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>USB products</h4>
<table class="table" id="tblProducts"> <table class="table" id="tblProducts">
<thead> <thead>
<tr> <tr>

View File

@@ -33,7 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
USB vendors <h4>USB vendors</h4>
<table class="table" id="tblVendors"> <table class="table" id="tblVendors">
<thead> <thead>
<tr> <tr>

View File

@@ -35,7 +35,7 @@
} }
<h3>Are you sure you want to delete this?</h3> <h3>Are you sure you want to delete this?</h3>
<div> <div>
<h4>Usb</h4> <h4>USB</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -34,7 +34,7 @@
// ****************************************************************************/ // ****************************************************************************/
} }
<div> <div>
<h4>Usb</h4> <h4>USB</h4>
<hr /> <hr />
<dl class="row"> <dl class="row">
<dt class="col-sm-2"> <dt class="col-sm-2">

View File

@@ -33,7 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
USB devices <h4>USB devices</h4>
<div> <div>
<a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a> <a asp-action="Consolidate" class="btn btn-danger">Consolidate duplicates</a>
</div> </div>

View File

@@ -33,6 +33,7 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
} }
<h4>DiscImageChef versions</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

View File

@@ -81,11 +81,13 @@ namespace DiscImageChef.Server.Models
Type = type; Type = type;
} }
public DateTime AddedWhen { get; set; } [DisplayName("Added when")]
public DateTime? ModifiedWhen { get; set; } public DateTime AddedWhen { get; set; }
public virtual CompactDiscOffset CdOffset { get; set; } [DisplayName("Modified when")]
public DateTime? ModifiedWhen { get; set; }
public virtual CompactDiscOffset CdOffset { get; set; }
[DefaultValue(0)] [DefaultValue(0), DisplayName("Optimal no. of sectors to be read at once")]
public int OptimalMultipleSectorsRead { get; set; } public int OptimalMultipleSectorsRead { get; set; }
public int? ATAId { get; set; } public int? ATAId { get; set; }

View File

@@ -31,6 +31,7 @@
// ****************************************************************************/ // ****************************************************************************/
using System; using System;
using System.ComponentModel;
using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Metadata;
namespace DiscImageChef.Server.Models namespace DiscImageChef.Server.Models
@@ -57,6 +58,7 @@ namespace DiscImageChef.Server.Models
Type = report.Type; Type = report.Type;
} }
[DisplayName("Uploaded when")]
public DateTime UploadedWhen { get; set; } public DateTime UploadedWhen { get; set; }
public int? ATAId { get; set; } public int? ATAId { get; set; }