diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-03-22 19:52:42 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-03-22 19:52:42 -0400 |
| commit | 7ca5efbbc576f3c6c43493654b2a0ac040fd4f31 (patch) | |
| tree | fae7a4e06a14ff7f8d709e2f4d5b8b92b8784a37 /src/SMAPI.Web/Views | |
| parent | 5ae640dc91adff8dfb0827e2a3c3f6b54be7c612 (diff) | |
| parent | 6d1494a56c5d04e7bc1ee406810a5a53dea2229a (diff) | |
| download | SMAPI-7ca5efbbc576f3c6c43493654b2a0ac040fd4f31.tar.gz SMAPI-7ca5efbbc576f3c6c43493654b2a0ac040fd4f31.tar.bz2 SMAPI-7ca5efbbc576f3c6c43493654b2a0ac040fd4f31.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI.Web/Views')
| -rw-r--r-- | src/SMAPI.Web/Views/JsonValidator/Index.cshtml | 9 | ||||
| -rw-r--r-- | src/SMAPI.Web/Views/LogParser/Index.cshtml | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml index a00c8387..7287e00b 100644 --- a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml +++ b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml @@ -28,14 +28,16 @@ { <meta name="robots" content="noindex" /> } - <link rel="stylesheet" href="~/Content/css/json-validator.css?r=20191204" /> + <link rel="stylesheet" href="~/Content/css/file-upload.css?r=202002" /> + <link rel="stylesheet" href="~/Content/css/json-validator.css?r=202002" /> <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/tmont/sunlight@1.22.0/src/themes/sunlight.default.min.css" /> <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/gh/tmont/sunlight@1.22.0/src/sunlight.min.js" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/gh/tmont/sunlight@1.22.0/src/plugins/sunlight-plugin.linenumbers.min.js" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/gh/tmont/sunlight@1.22.0/src/lang/sunlight.javascript.min.js" crossorigin="anonymous"></script> - <script src="~/Content/js/json-validator.js?r=20191204"></script> + <script src="~/Content/js/file-upload.js?r=202002"></script> + <script src="~/Content/js/json-validator.js?r=202002"></script> <script> $(function() { smapi.jsonValidator(@Json.Serialize(this.Url.PlainAction("Index", "JsonValidator", new { schemaName = "$schemaName", id = "$id" })), @Json.Serialize(Model.PasteID)); @@ -86,6 +88,7 @@ else if (!isEditView && Model.PasteID != null) { <h2>Upload a JSON file</h2> <form action="@this.Url.PlainAction("PostAsync", "JsonValidator")" method="post"> + <input id="inputFile" type="file" /> <ol> <li> Choose the JSON format:<br /> @@ -97,7 +100,7 @@ else if (!isEditView && Model.PasteID != null) </select> </li> <li> - Drag the file onto this textbox (or paste the text in):<br /> + Drag the file onto this textbox <small>(or <a href="#" id="choose-file-link">choose a file</a>)</small>:<br /> <textarea id="input" name="Content" placeholder="paste file here">@Model.Content</textarea> </li> <li> diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml index 87c7f918..2183992b 100644 --- a/src/SMAPI.Web/Views/LogParser/Index.cshtml +++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml @@ -22,10 +22,13 @@ { <meta name="robots" content="noindex" /> } - <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20191127" /> + <link rel="stylesheet" href="~/Content/css/file-upload.css?r=202002" /> + <link rel="stylesheet" href="~/Content/css/log-parser.css?r=202002" /> + <script src="https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.min.js" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js" crossorigin="anonymous"></script> - <script src="~/Content/js/log-parser.js?r=20190515"></script> + <script src="~/Content/js/file-upload.js?r=202002"></script> + <script src="~/Content/js/log-parser.js?r=202002"></script> <script> $(function() { smapi.logParser({ @@ -135,9 +138,10 @@ else if (Model.ParsedLog?.IsValid == true) <h2>How do I share my log?</h2> <form action="@this.Url.PlainAction("PostAsync", "LogParser")" method="post"> + <input id="inputFile" type="file" /> <ol> <li> - Drag the file onto this textbox (or paste the text in):<br /> + Drag the file onto this textbox <small>(or <a href="#" id="choose-file-link">choose a file</a>)</small>:<br /> <textarea id="input" name="input" placeholder="paste log here"></textarea> </li> <li> @@ -300,7 +304,7 @@ else if (Model.ParsedLog?.IsValid == true) string sectionFilter = message.Section != null && !message.IsStartOfSection ? $"&& sectionsAllow('{message.Section}')" : null; // filter the message by section if applicable <tr class="mod @levelStr @sectionStartClass" - @if (message.IsStartOfSection) { <text> v-on:click="toggleSection('@message.Section')" </text> } + @if (message.IsStartOfSection) { <text> v-on:click="toggleSection('@message.Section')" </text> } v-show="filtersAllow('@Model.GetSlug(message.Mod)', '@levelStr') @sectionFilter"> <td v-pre>@message.Time</td> <td v-pre>@message.Level.ToString().ToUpper()</td> |