Refactor.

This commit is contained in:
2019-11-02 21:37:09 +00:00
parent f653af2059
commit d4020f1a3f
52 changed files with 4207 additions and 4095 deletions

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
DiscImageChef's code of conduct:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
How to contribute to DiscImageChef:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
DiscImageChef list of changes:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
DiscImageChef list of things to be donated:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
DiscImageChef's template for issue reports:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
DiscImageChef's template for pull requests:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -36,7 +36,7 @@
// ****************************************************************************/
}
<p>
@Html.ActionLink("Return to main page.", "Index")<br />
@Html.ActionLink("Return to main page.", "Index")<br/>
DiscImageChef list of things to do:
</p>
<div class="container">@Html.Raw(ViewBag.Markdown)</div>

View File

@@ -42,91 +42,91 @@ DiscImageChef Report for
@ViewBag.lblModel
@ViewBag.lblRevision
@if(ViewBag.UsbItem != null)
@if (ViewBag.UsbItem != null)
{
<div id="divUsb">
<br />
<b>USB characteristics:</b><br />
<i>Manufacturer:</i> @ViewBag.UsbItem.Manufacturer<br />
<i>Product:</i> @ViewBag.UsbItem.Product<br />
<i>Vendor ID:</i> @ViewBag.UsbItem.VendorDescription<br />
<br/>
<b>USB characteristics:</b><br/>
<i>Manufacturer:</i> @ViewBag.UsbItem.Manufacturer<br/>
<i>Product:</i> @ViewBag.UsbItem.Product<br/>
<i>Vendor ID:</i> @ViewBag.UsbItem.VendorDescription<br/>
<i>Product ID:</i> @ViewBag.UsbItem.ProductDescription
</div>
}
@if(ViewBag.FireWireItem != null)
@if (ViewBag.FireWireItem != null)
{
<div id="divFireWire">
<br />
<b>FireWire characteristics:</b><br />
<i>Manufacturer:</i> @ViewBag.FireWire.Manufacturer<br />
<i>Product:</i> @ViewBag.FireWire.Product<br />
<i>Vendor ID:</i> @ViewBag.FireWire.VendorDescription<br />
<br/>
<b>FireWire characteristics:</b><br/>
<i>Manufacturer:</i> @ViewBag.FireWire.Manufacturer<br/>
<i>Product:</i> @ViewBag.FireWire.Product<br/>
<i>Vendor ID:</i> @ViewBag.FireWire.VendorDescription<br/>
<i>Product ID:</i> @ViewBag.FireWire.ProductDescription
</div>
}
@if(ViewBag.PcmciaItem != null)
@if (ViewBag.PcmciaItem != null)
{
<div id="divPcmcia">
<br />
<b>PCMCIA characteristics:</b><br />
<i>Manufacturer:</i> @ViewBag.PcmciaItem.Manufacturer<br />
<i>Product:</i> @ViewBag.PcmciaItem.ProductName<br />
<i>Manufacturer code:</i> @ViewBag.PcmciaItem.VendorDescription<br />
<i>Card code:</i> @ViewBag.PcmciaItem.CardCode<br />
<i>Compliance:</i> @ViewBag.PcmciaItem.Compliance<br />
@if(ViewBag.repPcmciaTuples != null)
<br/>
<b>PCMCIA characteristics:</b><br/>
<i>Manufacturer:</i> @ViewBag.PcmciaItem.Manufacturer<br/>
<i>Product:</i> @ViewBag.PcmciaItem.ProductName<br/>
<i>Manufacturer code:</i> @ViewBag.PcmciaItem.VendorDescription<br/>
<i>Card code:</i> @ViewBag.PcmciaItem.CardCode<br/>
<i>Compliance:</i> @ViewBag.PcmciaItem.Compliance<br/>
@if (ViewBag.repPcmciaTuples != null)
{
foreach(KeyValuePair<string, string> kvp in ViewBag.repPcmciaTuples)
foreach (KeyValuePair<string, string> kvp in ViewBag.repPcmciaTuples)
{
<text><i>@kvp.Key</i>: @kvp.Value<br /></text>
<text><i>@kvp.Key</i>: @kvp.Value<br/></text>
}
}
</div>
}
@if(ViewBag.AtaItem != null)
@if (ViewBag.AtaItem != null)
{
<div id="divAta">
<br />
<br/>
<b>
@ViewBag.AtaItem characteristics:
</b><br />
@ViewBag.lblAtaDeviceType<br />
@foreach(KeyValuePair<string, string> kvp in ViewBag.repAtaTwo)
</b><br/>
@ViewBag.lblAtaDeviceType<br/>
@foreach (KeyValuePair<string, string> kvp in ViewBag.repAtaTwo)
{
<text><i>@kvp.Key</i>: @kvp.Value<br /></text>
<text><i>@kvp.Key</i>: @kvp.Value<br/></text>
}
<br />
@foreach(string item in ViewBag.repAtaOne)
<br/>
@foreach (string item in ViewBag.repAtaOne)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
</div>
}
@if(ViewBag.repScsi != null)
@if (ViewBag.repScsi != null)
{
<div id="divScsi">
<br />
<b>SCSI characteristics:</b><br />
<i>Vendor: </i>@ViewBag.lblScsiVendor<br />
<i>Product: </i>@ViewBag.lblScsiProduct<br />
<i>Revision: </i>@ViewBag.lblScsiRevision<br />
@foreach(string item in ViewBag.repScsi)
<br/>
<b>SCSI characteristics:</b><br/>
<i>Vendor: </i>@ViewBag.lblScsiVendor<br/>
<i>Product: </i>@ViewBag.lblScsiProduct<br/>
<i>Revision: </i>@ViewBag.lblScsiRevision<br/>
@foreach (string item in ViewBag.repScsi)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
@if(ViewBag.repModeSense != null)
@if (ViewBag.repModeSense != null)
{
<div id="divScsiModeSense">
<br /><i>SCSI mode sense pages:</i>
<br/><i>SCSI mode sense pages:</i>
<table border="1">
<tr>
<th>Mode</th>
<th>Contents</th>
</tr>
@foreach(KeyValuePair<string, string> kvp in ViewBag.repModeSense)
@foreach (KeyValuePair<string, string> kvp in ViewBag.repModeSense)
{
<tr>
<td>
@@ -140,16 +140,16 @@ DiscImageChef Report for
</table>
</div>
}
@if(ViewBag.repEvpd != null)
@if (ViewBag.repEvpd != null)
{
<div id="divScsiEvpd">
<br /><i>SCSI extended vital product data pages:</i>
<br/><i>SCSI extended vital product data pages:</i>
<table border="1">
<tr>
<th>EVPD</th>
<th>Contents</th>
</tr>
@foreach(KeyValuePair<string, string> kvp in ViewBag.repEvpd)
@foreach (KeyValuePair<string, string> kvp in ViewBag.repEvpd)
{
<tr>
<td>
@@ -163,66 +163,66 @@ DiscImageChef Report for
</table>
</div>
}
@if(ViewBag.repScsiMmcMode != null)
@if (ViewBag.repScsiMmcMode != null)
{
<div id="divScsiMmcMode">
<br /><b>SCSI CD-ROM capabilities:</b><br />
@foreach(string item in ViewBag.repScsiMmcMode)
<br/><b>SCSI CD-ROM capabilities:</b><br/>
@foreach (string item in ViewBag.repScsiMmcMode)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
</div>
}
@if(ViewBag.repScsiMmcFeatures != null)
@if (ViewBag.repScsiMmcFeatures != null)
{
<div id="divScsiMmcFeatures">
<br /><b>SCSI MMC features:</b><br />
@foreach(string item in ViewBag.repScsiMmcFeatures)
<br/><b>SCSI MMC features:</b><br/>
@foreach (string item in ViewBag.repScsiMmcFeatures)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
</div>
}
@if(ViewBag.divScsiSscVisible == true)
@if (ViewBag.divScsiSscVisible == true)
{
<div id="divScsiSsc">
<br /><b>SCSI Streaming device capabilities:</b><br />
Block size granularity: @ViewBag.lblScsiSscGranularity<br />
Maximum block length: @ViewBag.lblScsiSscMaxBlock bytes<br />
Minimum block length: @ViewBag.lblScsiSscMinBlock bytes<br />
@if(ViewBag.repScsiSscDensities != null)
<br/><b>SCSI Streaming device capabilities:</b><br/>
Block size granularity: @ViewBag.lblScsiSscGranularity<br/>
Maximum block length: @ViewBag.lblScsiSscMaxBlock bytes<br/>
Minimum block length: @ViewBag.lblScsiSscMinBlock bytes<br/>
@if (ViewBag.repScsiSscDensities != null)
{
foreach(SupportedDensity density in ViewBag.repScsiSscDensities)
foreach (SupportedDensity density in ViewBag.repScsiSscDensities)
{
<text>
<br />
<br/>
<b>
Information for supported density with primary code @($"{density.PrimaryCode:X2h}") and secondary code @($"{density.SecondaryCode:X2h}")
</b><br />
Drive can write this density: @density.Writable<br />
Duplicate density: @density.Duplicate<br />
Default density: @density.DefaultDensity<br />
</b><br/>
Drive can write this density: @density.Writable<br/>
Duplicate density: @density.Duplicate<br/>
Default density: @density.DefaultDensity<br/>
Density has @density.BitsPerMm bits per mm, with @density.Tracks tracks in a @density.Width mm width tape
Name: @density.Name<br />
Organization: @density.Organization<br />
Description: @density.Description<br />
Maximum capacity: @density.Capacity megabytes<br />
Name: @density.Name<br/>
Organization: @density.Organization<br/>
Description: @density.Description<br/>
Maximum capacity: @density.Capacity megabytes<br/>
</text>
}
}
@if(ViewBag.repScsiSscMedias != null)
@if (ViewBag.repScsiSscMedias != null)
{
foreach(SscSupportedMedia media in ViewBag.repScsiSscMedias)
foreach (SscSupportedMedia media in ViewBag.repScsiSscMedias)
{
<text>
<br />
<br/>
<b>
Information for supported media with type code @($"{media.MediumType:X2h}")
</b><br />
</b><br/>
Media is @media.Length m long in a @media.Width mm width tape
Name: @media.Name<br />
Organization: @media.Organization<br />
Description: @media.Description<br />
Name: @media.Name<br/>
Organization: @media.Organization<br/>
Description: @media.Description<br/>
</text>
}
}
@@ -230,35 +230,35 @@ DiscImageChef Report for
}
</div>
}
@if(ViewBag.repTestedMedia != null)
@if (ViewBag.repTestedMedia != null)
{
<div id="divTestedMedia">
<br /><b>Tested media:</b><br />
@foreach(string item in ViewBag.repTestedMedia)
<br/><b>Tested media:</b><br/>
@foreach (string item in ViewBag.repTestedMedia)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
</div>
}
@if(ViewBag.repMMC != null)
@if (ViewBag.repMMC != null)
{
<div id="divMMC">
<br />
<b>MultiMediaCard device:</b><br />
@foreach(string item in ViewBag.repMMC)
<br/>
<b>MultiMediaCard device:</b><br/>
@foreach (string item in ViewBag.repMMC)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
</div>
}
@if(ViewBag.repSD != null)
@if (ViewBag.repSD != null)
{
<div id="divSD">
<br />
<b>SecureDigital device:</b><br />
@foreach(string item in ViewBag.repSD)
<br/>
<b>SecureDigital device:</b><br/>
@foreach (string item in ViewBag.repSD)
{
@Html.Raw(item)<br />
@Html.Raw(item)<br/>
}
</div>
}

View File

@@ -22,4 +22,4 @@
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
</p>

View File

@@ -35,23 +35,23 @@
<html>
<meta charset="UTF-8">
<head>
@switch(DateTime.UtcNow.DayOfYear)
@switch (DateTime.UtcNow.DayOfYear)
{
// 24th January, Macintosh launch
case 24:
<link href="~/css/mac/dicserver.css"
rel="stylesheet" type="text/css" />
rel="stylesheet" type="text/css"/>
<link href="~/css/mac/dicserver_highcharts.css"
rel="stylesheet" type="text/css" />
rel="stylesheet" type="text/css"/>
break;
default:
<link href="~/css/dos/dicserver.css"
rel="stylesheet" type="text/css" />
rel="stylesheet" type="text/css"/>
<link href="~/css/dos/dicserver_highcharts.css"
rel="stylesheet" type="text/css" />
rel="stylesheet" type="text/css"/>
break;
}
<meta charset="utf-8" />
<meta charset="utf-8"/>
<title>@ViewBag.Title</title>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async
@@ -73,8 +73,8 @@
<a href="http://www.claunia.com"
target="_blank">
Claunia.com
</a><br />
@switch(DateTime.UtcNow.DayOfYear)
</a><br/>
@switch (DateTime.UtcNow.DayOfYear)
{
// 24th January, Macintosh launch
case 24:
@@ -86,7 +86,7 @@
;
break;
}
<br />
<br/>
CSS © 2018-2019
<a href="https://getbootstrap.com/"
target="_blank">

View File

@@ -1,2 +1,2 @@
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>

View File

@@ -1,9 +1,4 @@
@using System.Collections
@using DiscImageChef.CommonTypes.Metadata
@using DiscImageChef.Server.Models
@using Highsoft.Web.Mvc.Charts
@using Chart = Highsoft.Web.Mvc.Charts.Chart
@using Filter = DiscImageChef.Server.Models.Filter
@{
// /***************************************************************************
// The Disc Image Chef
@@ -51,7 +46,7 @@
</i> Server version @ViewBag.Version
</header>
<div class="container-fluid mt-3">
@if(ViewBag.repOperatingSystems != null)
@if (ViewBag.repOperatingSystems != null)
{
<div class="container"
id="divOperatingSystems">
@@ -129,7 +124,7 @@
id="osCollapse">
<div class="card-body">
<table class="table-dark">
@foreach(NameValueStats os in ViewBag.repOperatingSystems)
@foreach (NameValueStats os in ViewBag.repOperatingSystems)
{
<tr>
<td class="text-left">
@@ -142,10 +137,10 @@
</div>
</div>
</div>
<br />
<br/>
</div>
}
@if(ViewBag.repVersions != null)
@if (ViewBag.repVersions != null)
{
<div class="container mt-3"
id="divVersions">
@@ -175,7 +170,7 @@
id="versionsCollapse">
<div class="card-body">
<table class="table-dark">
@foreach(NameValueStats version in ViewBag.repVersions)
@foreach (NameValueStats version in ViewBag.repVersions)
{
<tr>
<td class="text-left">
@@ -188,10 +183,10 @@
</div>
</div>
</div>
<br />
<br/>
</div>
}
@if(ViewBag.repCommands != null)
@if (ViewBag.repCommands != null)
{
<div class="container mt-3"
id="divCommands">
@@ -221,7 +216,7 @@
id="commandsCollapse">
<div class="card-body">
<table class="table-dark">
@foreach(Command command in ViewBag.repCommands)
@foreach (Command command in ViewBag.repCommands)
{
<tr>
<td class="text-left">
@@ -234,10 +229,10 @@
</div>
</div>
</div>
<br />
<br/>
</div>
}
@if(ViewBag.repFilters != null)
@if (ViewBag.repFilters != null)
{
<div class="container mt-3"
id="divFilters">
@@ -271,7 +266,7 @@
<th class="table-dark-header">Filter</th>
<th class="table-dark-header">Times</th>
</tr>
@foreach(Filter filter in ViewBag.repFilters)
@foreach (Filter filter in ViewBag.repFilters)
{
<tr>
<td class="text-right">
@@ -289,7 +284,7 @@
</div>
</div>
}
@if(ViewBag.repMediaImages != null)
@if (ViewBag.repMediaImages != null)
{
<div class="container mt-3"
id="divMediaImages">
@@ -323,7 +318,7 @@
<th class="table-dark-header">Media image format</th>
<th class="table-dark-header">Times</th>
</tr>
@foreach(MediaFormat format in ViewBag.repMediaImages)
@foreach (MediaFormat format in ViewBag.repMediaImages)
{
<tr>
<td class="text-left">
@@ -341,7 +336,7 @@
</div>
</div>
}
@if(ViewBag.repPartitions != null)
@if (ViewBag.repPartitions != null)
{
<div class="container mt-3"
id="divPartitions">
@@ -375,7 +370,7 @@
<th class="table-dark-header">Partitioning scheme</th>
<th class="table-dark-header">Times</th>
</tr>
@foreach(Partition partition in ViewBag.repPartitions)
@foreach (Partition partition in ViewBag.repPartitions)
{
<tr>
<td class="text-left">
@@ -393,7 +388,7 @@
</div>
</div>
}
@if(ViewBag.repFilesystems != null)
@if (ViewBag.repFilesystems != null)
{
<div class="container mt-3"
id="divFilesystems">
@@ -427,7 +422,7 @@
<th class="table-dark-header">Filesystem name</th>
<th class="table-dark-header">Times</th>
</tr>
@foreach(Filesystem filesystem in ViewBag.repFilesystems)
@foreach (Filesystem filesystem in ViewBag.repFilesystems)
{
<tr>
<td class="text-left">
@@ -445,7 +440,7 @@
</div>
</div>
}
@if(ViewBag.repVirtualMedia != null)
@if (ViewBag.repVirtualMedia != null)
{
<div class="container mt-3"
id="divVirtualMedia">
@@ -480,7 +475,7 @@
<th class="table-dark-header">Logical type</th>
<th class="table-dark-header">Times</th>
</tr>
@foreach(MediaItem media in ViewBag.repVirtualMedia)
@foreach (MediaItem media in ViewBag.repVirtualMedia)
{
<tr>
<td class="text-left">
@@ -501,7 +496,7 @@
</div>
</div>
}
@if(ViewBag.repRealMedia != null)
@if (ViewBag.repRealMedia != null)
{
<div class="container mt-3"
id="divRealMedia">
@@ -536,7 +531,7 @@
<th class="table-dark-header">Logical type</th>
<th class="table-dark-header">Times</th>
</tr>
@foreach(MediaItem media in ViewBag.repRealMedia)
@foreach (MediaItem media in ViewBag.repRealMedia)
{
<tr>
<td class="text-left">
@@ -557,7 +552,7 @@
</div>
</div>
}
@if(ViewBag.repDevices != null)
@if (ViewBag.repDevices != null)
{
<div class="container mt-3"
id="divDevices">
@@ -623,7 +618,7 @@
<th class="table-dark-header">Bus</th>
<th class="table-dark-header">Report</th>
</tr>
@foreach(DeviceItem device in ViewBag.repDevices)
@foreach (DeviceItem device in ViewBag.repDevices)
{
<tr>
<td>
@@ -639,12 +634,14 @@
@device.Bus
</td>
<td>
@if(device.ReportId != 0)
@if (device.ReportId != 0)
{
<text>@Html.ActionLink("Yes", "View", "Report", new {id = device.ReportId}, new {target = "_blank"})</text>
}
else
{ <text>No</text> }
{
<text>No</text>
}
</td>
</tr>
}
@@ -657,7 +654,7 @@
<script src="http://code.highcharts.com/highcharts.js"></script>
<script src="https://code.highcharts.com/modules/exporting.js"></script>
@{
/* string highChartsTitleColor;
/* string highChartsTitleColor;
string highChartsDataLabelColor;
switch(DateTime.UtcNow.DayOfYear)

View File

@@ -1,3 +1,3 @@
@using DiscImageChef.Server
@using DiscImageChef.Server.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

View File

@@ -1,3 +1,3 @@
@{
Layout = "_Layout";
}
}