From 3ba567eaddeaa0bb2bdd749b56e0601d1cf65a25 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 4 Aug 2019 03:28:34 -0400
Subject: add JSON validator with initial support for manifest format (#654)

---
 src/SMAPI.Web/Views/Shared/_Layout.cshtml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI.Web/Views/Shared/_Layout.cshtml')

diff --git a/src/SMAPI.Web/Views/Shared/_Layout.cshtml b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
index 4c602b29..9911ef0e 100644
--- a/src/SMAPI.Web/Views/Shared/_Layout.cshtml
+++ b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
@@ -16,9 +16,14 @@
         <h4>SMAPI</h4>
         <ul>
             <li><a href="@SiteConfig.Value.RootUrl">About SMAPI</a></li>
+            <li><a href="https://stardewvalleywiki.com/Modding:Index">Modding docs</a></li>
+        </ul>
+
+        <h4>Tools</h4>
+        <ul>
             <li><a href="@SiteConfig.Value.ModListUrl">Mod compatibility</a></li>
             <li><a href="@SiteConfig.Value.LogParserUrl">Log parser</a></li>
-            <li><a href="https://stardewvalleywiki.com/Modding:Index">Docs</a></li>
+            <li><a href="@SiteConfig.Value.JsonValidatorUrl">JSON validator</a></li>
         </ul>
     </div>
     <div id="content-column">
-- 
cgit 


From 3f6865e8301535c8fbe83bc0f931a116adac0636 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 6 Aug 2019 13:35:20 -0400
Subject: add footer tip about using schema directly, add details to page title
 (#654)

---
 docs/technical/web.md                              |  2 +-
 src/SMAPI.Web/Views/JsonValidator/Index.cshtml     | 27 +++++++++++++++++-----
 src/SMAPI.Web/Views/Shared/_Layout.cshtml          |  2 +-
 .../wwwroot/Content/css/json-validator.css         |  9 ++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

(limited to 'src/SMAPI.Web/Views/Shared/_Layout.cshtml')

diff --git a/docs/technical/web.md b/docs/technical/web.md
index 27834a4f..8fd99f82 100644
--- a/docs/technical/web.md
+++ b/docs/technical/web.md
@@ -101,7 +101,7 @@ text editors that support schema validation. For example:
 }
 ```
 
-Current schemas:
+Available schemas:
 
 format | schema URL
 ------ | ----------
diff --git a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
index 34c1c1f3..3143fad9 100644
--- a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
+++ b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
@@ -2,12 +2,22 @@
 @model JsonValidatorModel
 
 @{
-    ViewData["Title"] = "JSON validator";
-
+    // get view data
     string curPageUrl = new Uri(new Uri(Model.SectionUrl), $"{Model.SchemaName}/{Model.PasteID}").ToString();
-    string newUploadUrl = Model.SchemaName != null
-        ? new Uri(new Uri(Model.SectionUrl), Model.SchemaName).ToString()
-        : Model.SectionUrl;
+    string newUploadUrl = Model.SchemaName != null ? new Uri(new Uri(Model.SectionUrl), Model.SchemaName).ToString() : Model.SectionUrl;
+    string schemaDisplayName = null;
+    bool isValidSchema = Model.SchemaName != null && Model.SchemaFormats.TryGetValue(Model.SchemaName, out schemaDisplayName) && schemaDisplayName != "None";
+
+    // build title
+    ViewData["Title"] = "JSON validator";
+    @if (Model.PasteID != null)
+    {
+        ViewData["ViewTitle"] = ViewData["Title"];
+        ViewData["Title"] +=
+            " ("
+            + string.Join(", ", new[] { isValidSchema ? schemaDisplayName : null, Model.PasteID }.Where(p => p != null))
+            + ")";
+    }
 }
 
 @section Head {
@@ -130,7 +140,12 @@ else if (Model.PasteID != null)
             }
         }
 
-        <h2>Raw content</h2>
+        <h2>Content</h2>
         <pre id="raw-content" class="sunlight-highlight-javascript">@Model.Content</pre>
+
+        @if (isValidSchema)
+        {
+            <p class="footer-tip">(Tip: you can <a href="https://github.com/Pathoschild/SMAPI/blob/develop/docs/technical/web.md#using-a-schema-file-directly">validate directly in your text editor</a> if it supports JSON Schema.)</p>
+        }
     </div>
 }
diff --git a/src/SMAPI.Web/Views/Shared/_Layout.cshtml b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
index 9911ef0e..87a22f06 100644
--- a/src/SMAPI.Web/Views/Shared/_Layout.cshtml
+++ b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
@@ -28,7 +28,7 @@
     </div>
     <div id="content-column">
         <div id="content">
-            <h1>@ViewData["Title"]</h1>
+            <h1>@(ViewData["ViewTitle"] ?? ViewData["Title"])</h1>
             @RenderBody()
         </div>
         <div id="footer">
diff --git a/src/SMAPI.Web/wwwroot/Content/css/json-validator.css b/src/SMAPI.Web/wwwroot/Content/css/json-validator.css
index d4a43032..cd117694 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/json-validator.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/json-validator.css
@@ -76,6 +76,15 @@
     background-color: #eeeacc;
 }
 
+.footer-tip {
+    color: gray;
+    font-size: 0.9em;
+}
+
+.footer-tip a {
+    color: gray;
+}
+
 /*********
 ** Upload form
 *********/
-- 
cgit