remove byte counter

2020-01-13 21:50:53 +01:00
parent 5445818051
commit 1702949632
8 changed files with 36 additions and 45 deletions
--- a/res/include/script/Toolbar.js
+++ b/res/include/script/Toolbar.js
@@ -173,6 +173,19 @@ function loadCaptcha(){
 	});
 }

+function formatDataVolume(amt) {
+	if (amt > 1e12) {
+		return Math.round(amt/1e9)/1e3 + " TB";
+	} else if (amt > 1e9) {
+		return Math.round(amt/1e6)/1e3 + " GB";
+	} else if (amt > 1e6) {
+		return Math.round(amt/1e3)/1e3 + " MB";
+	} else if (amt > 1e3) {
+		return Math.round(amt)/1e3 + " kB";
+	}
+	return amt + " B"
+}
+
 var DetailsWindow = {
 	visible:       false,
 	fileID:        "",
@@ -218,8 +231,8 @@ var DetailsWindow = {
 						+ "<tr><td>URL<td><td><a href=\"/u/" + data.id + "\">/u/" + data.id + "</a></td></tr>"
 						+ "<tr><td>Mime Type<td><td>" + escapeHTML(data.mime_type) + "</td></tr>"
 						+ "<tr><td>ID<td><td>" + data.id + "</td></tr>"
-						+ "<tr><td>Size<td><td class=\"bytecounter\">" + data.size + "</td></tr>"
-						+ "<tr><td>Bandwidth<td><td class=\"bytecounter\">" + data.bandwidth_used + "</td></tr>"
+						+ "<tr><td>Size<td><td>" + formatDataVolume(data.size) + "</td></tr>"
+						+ "<tr><td>Bandwidth<td><td>" + formatDataVolume(data.bandwidth_used) + "</td></tr>"
 						+ "<tr><td>Upload Date<td><td>" + data.date_upload + "</td></tr>"
 						+ "<tr><td>Description<td><td>" + escapeHTML(file.description) + "</td></tr>"
 						+ "</table>"
@@ -237,8 +250,8 @@ var DetailsWindow = {
 				+ "<tr><td>Name<td><td>" + escapeHTML(file.name) + "</td></tr>"
 				+ "<tr><td>Mime Type<td><td>" + escapeHTML(file.mime_type) + "</td></tr>"
 				+ "<tr><td>ID<td><td>" + file.id + "</td></tr>"
-				+ "<tr><td>Size<td><td class=\"bytecounter\">" + file.size + "</td></tr>"
-				+ "<tr><td>Bandwidth<td><td class=\"bytecounter\">" + file.bandwidth_used + "</td></tr>"
+				+ "<tr><td>Size<td><td>" + formatDataVolume(file.size) + "</td></tr>"
+				+ "<tr><td>Bandwidth<td><td>" + formatDataVolume(file.bandwidth_used) + "</td></tr>"
 				+ "<tr><td>Upload Date<td><td>" + file.date_upload + "</td></tr>"
 				+ "</table>"
 			);
--- a/res/include/style/layout.css
+++ b/res/include/style/layout.css
@@ -248,7 +248,7 @@ h3{font-size: 1.5em;  font-family: "light";   font-weight: normal;}
 h4{font-size: 1.25em; font-family: "default"; font-weight: normal;}
 h5{font-size: 1em;    font-family: "default"; font-weight: normal;}
 h6{font-size: .75em;  font-family: "default"; font-weight: normal;}
-h3, h2{border-bottom: 1px var(--layer_3_color_border) solid;} /* Differentiate it a bit, else it just looks like bold text */
+h2, h3{border-bottom: 1px var(--layer_3_color_border) solid;} /* Differentiate it a bit, else it just looks like bold text */

 p, .indent {
 	margin: 10px;
@@ -289,7 +289,7 @@ a:hover {color: var(--highlight_color); text-decoration: underline;}
 }
 table:not(.form) {border-collapse: collapse; width: 100%;}
 tr:not(.form)    {border-bottom: 1px var(--layer_2_color_border) solid;}
-tr > td          {padding: 0.5em;}
+tr > td          {padding: 0.3em;}
@media(max-width: 30em) {
 	tr > td {
 		box-sizing: border-box;
--- a/res/include/style/viewer.css
+++ b/res/include/style/viewer.css
@@ -312,7 +312,6 @@
 }

 table {width: auto !important;}
-table > tbody > tr {border: none !important;}

 .corner-popup{
 	position: fixed;
@@ -328,21 +327,6 @@ table > tbody > tr {border: none !important;}
 	z-index: 200;
 }

-.bytecounter{
-	color: var(--text_color);
-	font-size: 16px;
-	font-family: monospace, monospace;
-	line-height: 20px;
-	text-align: right;
-	display: inline-block;
-	background-image: url("/res/img/bytecounter.png");
-	background-position: top right;
-	width: 136px;
-	height: 36px;
-	padding: 0;
-	padding-right: 1px;
-}
-
 /* ====================
   || LIST NAVIGATOR ||
   ==================== */
--- a/res/static/img/bytecounter.png
+++ b/res/static/img/bytecounter.png
--- a/res/static/img/bytecounter.xcf
+++ b/res/static/img/bytecounter.xcf
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -99,7 +99,6 @@
 				</div>

 				<div id="filepreview" class="file_viewer_file_preview">
-					<!-- <img src="{{template `loadthink.gif`}}" style="margin-top: 20%; width: 200px; height: 200px;" /> -->
 					<div class="image" style="margin-top: 20%; width: 100px; height: 100px;">{{template "spinner.svg" .}}</div>
 				</div>
 			</div>
@@ -141,19 +140,6 @@
 						<tr><td>r</td><td> = Toggle shuffle (<b><u>r</u></b>andom)</td></tr>
 						<tr><td>SHIFT + s</td><td> = Download all the files in the list as a zip archive</td></tr>
 					</table>
-
-					<h3>Credits</h3>
-					All server side code written by
-					<a target="_blank" href="https://fornaxian.com/">Fornax (me)</a>.
-					<br/>
-					<br/>
-					Code syntax highlighting is by
-					<a target="_blank" href="https://github.com/google/code-prettify">Google Code-prettify</a>.
-					<br/>
-					<br/>
-					Thanks to the Mozilla team for their wonderful PDF viewer
-					<a target="_blank" href="https://github.com/mozilla/pdf.js">pdf.js</a>.
-					<br/>
 				</span>
 			</div>
 		</div>
--- a/res/template/home.html
+++ b/res/template/home.html
@@ -29,7 +29,7 @@

 			<br/>
 			<div class="limit_width">
-				<h1>What is pixeldrain?</h1>
+				<h2>What is pixeldrain?</h2>
 				<p>
 					Pixeldrain is a file sharing website built for speed and
 					ease of use. Pixeldrain does not cost any money, though
--- a/webcontroller/user_style.go
+++ b/webcontroller/user_style.go
@@ -85,14 +85,18 @@ func (s pixeldrainStyleSheet) String() string {
 	--background_color:           #%s;
 	--body_color:                 #%s;

-	--layer_1_color:  #%s;
-	--layer_1_shadow: %s;
-	--layer_2_color:  #%s;
-	--layer_2_shadow: %s;
-	--layer_3_color:  #%s;
-	--layer_3_shadow: %s;
-	--layer_4_color:  #%s;
-	--layer_4_shadow: %s;
+	--layer_1_color:        #%s;
+	--layer_1_color_border: #%s;
+	--layer_1_shadow:       %s;
+	--layer_2_color:        #%s;
+	--layer_2_color_border: #%s;
+	--layer_2_shadow:       %s;
+	--layer_3_color:        #%s;
+	--layer_3_color_border: #%s;
+	--layer_3_shadow:       %s;
+	--layer_4_color:        #%s;
+	--layer_4_color_border: #%s;
+	--layer_4_shadow:       %s;

 	--shadow_color:     #%s;
 	--shadow_spread:    %s;
@@ -114,12 +118,16 @@ func (s pixeldrainStyleSheet) String() string {
 		s.BackgroundColor.RGB(),
 		s.BodyColor.RGB(),
 		s.Layer1Color.RGB(),
+		s.Layer1Color.add(0, 0, .05).RGB(),
 		fmt.Sprintf("%dpx", s.Layer1Shadow),
 		s.Layer2Color.RGB(),
+		s.Layer2Color.add(0, 0, .05).RGB(),
 		fmt.Sprintf("%dpx", s.Layer2Shadow),
 		s.Layer3Color.RGB(),
+		s.Layer3Color.add(0, 0, .05).RGB(),
 		fmt.Sprintf("%dpx", s.Layer3Shadow),
 		s.Layer4Color.RGB(),
+		s.Layer4Color.add(0, 0, .05).RGB(),
 		fmt.Sprintf("%dpx", s.Layer4Shadow),
 		s.ShadowColor.RGB(),
 		fmt.Sprintf("%dpx", s.ShadowSpread),