From 467b9aa2df8532aa3cb94c84307c7012573d61d4 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 27 Oct 2017 19:38:37 -0400 Subject: integrate prototype into page layout (#358) --- src/SMAPI.Web/Views/LogParser/Index.cshtml | 197 +++++++++++------------ src/SMAPI.Web/wwwroot/Content/css/log-parser.css | 77 +++------ src/SMAPI.Web/wwwroot/Content/js/log-parser.js | 2 +- 3 files changed, 122 insertions(+), 154 deletions(-) (limited to 'src') diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml index 021293b6..87a3962b 100644 --- a/src/SMAPI.Web/Views/LogParser/Index.cshtml +++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml @@ -6,114 +6,107 @@ + } -

How to share a SMAPI log

Find your SMAPI log.
Click the file and drag it onto the upload form below (or paste the text in).
Click Parse.
Share the link you get back.

+@********* +** Intro +*********@ +

This page lets you upload, view, and share a SMAPI log to help troubleshoot mod issues.

Parsed log

-TODO - - - - - SMAPI log parser - - - -

TRACE
DEBUG
INFO
ALERT
WARN
ERROR
Click tabs to toggle message visibility
UPLOAD

- - - - - -

Upload log file

- -

- - -

TRACE
DEBUG
INFO
ALERT
WARN
ERROR
Click tabs to toggle message visibility

+ + + + + +

Upload log file

Find your SMAPI log.
Drag the file onto the textbox below (or paste the text in).
Click Parse.
Share the link you get back.

+ +

Raw log file

- -

+ +

diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css index 0aff5b81..afa79a65 100644 --- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css +++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css @@ -1,16 +1,7 @@ -body { - font-size: 10pt; - background: #fff; -} - .mod-repeat { font-size: 8pt; } -input[type="button"] { - cursor: pointer; -} - .template { display: none; } @@ -27,6 +18,16 @@ input[type="button"] { padding: 5px; } +#upload-button { + background: #ccf; + border: 1px solid #000088; +} + +#upload-button { + background: #eef; +} + + #uploader:after { content: attr(data-text); display: block; @@ -58,50 +59,45 @@ input[type="button"] { font-family: sans-serif; font-size: 40px; margin-top: -25px; + z-index: 10; + border-bottom: 0; } .frame { margin: auto; margin-top: 25px; + padding: 2em; position: absolute; top: 10%; left: 10%; right: 10%; bottom: 10%; padding-bottom: 30px; -} - -.buttons { - position: absolute; - display: inline-block; - bottom: -10px; - right: 0px; - padding: 5px; - border: 1px solid #008; + background: #FFF; border-radius: 5px; - background: #fff; + border: 1px solid #008; } -#cancel, #closeraw { +input[type="button"] { font-size: 20px; border-radius: 5px; - border: 1px solid #880000; - background-color: #fcc; outline: none; box-shadow: inset 0px 0px 1px 1px rgba(0, 0, 0, .2); + cursor: pointer; } -#cancel:hover, #closeraw:hover { +#input[type="button"]:hover { background-color: #fee; } +#cancel, #closeraw { + border: 1px solid #880000; + background-color: #fcc; +} + #submit { - font-size: 20px; - border-radius: 5px; border: 1px solid #008800; background-color: #cfc; - outline: none; - box-shadow: inset 0px 0px 1px 1px rgba(0, 0, 0, .2); } #submit:hover { @@ -109,9 +105,9 @@ input[type="button"] { } #input, #dataraw { - width: 100%; - height: 100%; - max-width: 100%; + width: 80%; + height: 30em; + max-width: 80%; max-height: 100%; margin: auto; box-sizing: border-box; @@ -130,12 +126,8 @@ input[type="button"] { } #tabs { - top: 0px; - left: 0px; - right: 0px; border-bottom: 0; display: block; - position: fixed; margin: 0; padding: 0; background: linear-gradient(to bottom, rgba(255, 255, 255, 1) 0%, rgba(210, 235, 249, 1) 100%); @@ -144,7 +136,6 @@ input[type="button"] { #tabs li { margin: 5px 1px 0 0; height: 25px; - float: left; display: inline-block; width: 75px; border: 1px solid #000000; @@ -179,17 +170,6 @@ input[type="button"] { background: #efe; } -#tabs li.upload { - float: right; - background: #ccf; - border-color: #000088; - margin-right: 5px; -} - -#tabs li.upload:hover { - background: #eef; -} - #tabs li.notice { color: #000000; background: transparent; @@ -206,11 +186,6 @@ input[type="button"] { #output { border-top: 1px solid #888; - position: fixed; - top: 30px; - left: 0px; - right: 0px; - bottom: 0px; padding: 10px; overflow: auto; font-family: monospace; diff --git a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js index 2d095787..a1d07a78 100644 --- a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js +++ b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js @@ -196,7 +196,7 @@ $(function() { t.toggleClass("active"); $("#output").toggleClass(t.text().toLowerCase()); }) - $("#upload").on("click", function() { + $("#upload-button").on("click", function() { memory = $("#input").val() || ""; $("#input").val(""); $("#popup-upload").fadeIn(); -- cgit