Update html.

2025-02-17 09:35:49 +00:00 · 2017-05-14 14:50:16 +01:00 · 2017-05-14 14:50:16 +01:00 · 72cadf20f2
commit 72cadf20f2
parent 791902b8f0
43 changed files with 57 additions and 40 deletions
--- a/html/Pictures/edit-ink.png
+++ b/html/Pictures/edit-ink.png
--- a/html/Pictures/new-ink.png
+++ b/html/Pictures/new-ink.png
--- a/html/Pictures/save-ink.png
+++ b/html/Pictures/save-ink.png
--- a/html/Pictures/tawashi-icon-new.png
+++ b/html/Pictures/tawashi-icon-new.png
--- a/html/Pictures/text-ink.png
+++ b/html/Pictures/text-ink.png
--- a/html/error.html.mstch
+++ b/html/error.html.mstch
@ -1,13 +1,12 @@
-{{> head}}
+{{>head}}
 <body>
-	<form action="{{base_uri}}/paste.cgi" method="post" accept-charset="UTF-8">

-	{{> topbar}}
+<div id="content" class="error">

-	<p>An error occurred: {{error_message}}</p>
-
-</form>
+	{{> error_code}}
+	{{> error_message}}

+	</div>

 </body>
 </html>
--- a/html/head.mustache
+++ b/html/head.mustache
@ -6,7 +6,7 @@
 		<meta charset="UTF-8"/>
 		<meta name="description" content="Tawashi, text storage site." />
 		<meta name="keywords" content="text storage, pastebin, source code snippets, code review" />
-		<meta name="author" content="Unknown" />
+		<meta name="author" content="Elena" />
 		<link rel="stylesheet" href="tawashi.css" />
 		<link rel="icon" href="icon" />

--- a/html/index.html.mstch
+++ b/html/index.html.mstch
@ -11,7 +11,7 @@
 	<div>
 		<p class="title">Syntax Highlighting:</p>
 			<select name="lang" class="selectBox">
-				<option value="plaintext" selected="selected">None  </option>
+				<option value="" selected="selected">None  </option>
 				{{#languages}}
 				<option value="{{language_name}}">{{language_name}}</option>
 				{{/languages}}
--- a/html/tawashi.css
+++ b/html/tawashi.css
@ -26,10 +26,16 @@ body {
 	border-bottom: 2px solid black;
 }

+#content {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+
 #version{
-	font-size: 20px;
+	font-size: 17px;
 	margin: 0px;
-	padding: 0px 10px;
+	padding: 0px 0px;
 	color: RGBA(0, 146, 0, 255);
 	font-weight: bold;
 }
@ -38,23 +44,15 @@ body {
 	padding-right: 20px;
 }

-.icon-green {
-	height: 80px;
-}
-
 .icon-right {
 	float: right;
 }

-
 #PasteTextBox{
-	width: 100%;
 	height: 400px;
-   padding: 20px 5px;
-   border: black;
+	width: 600px;
   margin: 20px;
-   box-sizing: border-box;
-   border-radius: 4px;
+   border: 0px;
   background-color: #303030;
   color: #EDEDED;
   resize: none;
@ -74,9 +72,13 @@ body {
  margin-right: 20px;
  border: solid #9e9e9e 1px;
  text-decoration: none;
-  display: inline-block; 
+  display: inline-block;
  -webkit-border-radius: 5px;
  -moz-border-radius: 5px;
  border-radius: 5px;
 }

+.error {
+	font-size: 28px;
+	text-align: center;
+}
--- a/html/templates/C++.svg
+++ b/html/templates/C++.svg
--- a/html/Pictures/template/edit-icon.xcf
+++ b/html/Pictures/template/edit-icon.xcf
--- a/html/templates/bin/edit-ink.png
+++ b/html/templates/bin/edit-ink.png
--- a/html/templates/bin/edit-ink.svg
+++ b/html/templates/bin/edit-ink.svg
--- a/html/Pictures/template/edit.png
+++ b/html/Pictures/template/edit.png
--- a/html/Pictures/template/new-icon.xcf
+++ b/html/Pictures/template/new-icon.xcf
--- a/html/templates/bin/new-ink.png
+++ b/html/templates/bin/new-ink.png
--- a/html/templates/bin/new-ink.svg
+++ b/html/templates/bin/new-ink.svg
--- a/html/Pictures/template/new.jpeg
+++ b/html/Pictures/template/new.jpeg
--- a/html/Pictures/template/save-icon.xcf
+++ b/html/Pictures/template/save-icon.xcf
--- a/html/templates/bin/save-ink.png
+++ b/html/templates/bin/save-ink.png
--- a/html/templates/bin/save-ink.svg
+++ b/html/templates/bin/save-ink.svg
--- a/html/Pictures/template/save.jpeg
+++ b/html/Pictures/template/save.jpeg
--- a/html/Pictures/template/tawashi-icon-new.xcf
+++ b/html/Pictures/template/tawashi-icon-new.xcf
--- a/html/templates/bin/tawashi-icon.png
+++ b/html/templates/bin/tawashi-icon.png
--- a/html/Pictures/template/tawashi-icon.xcf
+++ b/html/Pictures/template/tawashi-icon.xcf
--- a/html/Pictures/template/text-icon.xcf
+++ b/html/Pictures/template/text-icon.xcf
--- a/html/templates/bin/text-ink.png
+++ b/html/templates/bin/text-ink.png
--- a/html/templates/bin/text-ink.svg
+++ b/html/templates/bin/text-ink.svg
--- a/html/Pictures/template/text.png
+++ b/html/Pictures/template/text.png
--- a/html/templates/edit-ink-t.png
+++ b/html/templates/edit-ink-t.png
--- a/html/templates/edit-ink-t.svg
+++ b/html/templates/edit-ink-t.svg
--- a/html/templates/edit.html.mstch
+++ b/html/templates/edit.html.mstch
@ -0,0 +1,13 @@
+
+{{> head}}
+<body>
+
+	{{> topbar}}
+
+	<div id="content">
+		<p>{{pastie}}</p>
+	</div>
+
+</body>
+</html>
+
--- a/html/templates/github-icon.jpeg
+++ b/html/templates/github-icon.jpeg
--- a/html/templates/github.jpg
+++ b/html/templates/github.jpg
--- a/html/templates/new-ink-t.png
+++ b/html/templates/new-ink-t.png
--- a/html/templates/new-ink-t.svg
+++ b/html/templates/new-ink-t.svg
--- a/html/templates/paste.html.mstch
+++ b/html/templates/paste.html.mstch
@ -0,0 +1,11 @@
+{{> head}}
+<body>
+	
+	{{> topbar}}
+
+	<div id="content">
+		<p>{{pastie}}</p>
+	</div>
+	
+</body>
+</html>
--- a/html/templates/save-ink-t.png
+++ b/html/templates/save-ink-t.png
--- a/html/templates/save-ink-t.svg
+++ b/html/templates/save-ink-t.svg
--- a/html/templates/text-ink-t.png
+++ b/html/templates/text-ink-t.png
--- a/html/templates/text-ink-t.svg
+++ b/html/templates/text-ink-t.svg
--- a/html/text.html.mstch
+++ b/html/text.html.mstch
@ -1,20 +1,11 @@
 {{>head}}
 <body>
-	
-	<div id="topbar">
-		<p id="version">tawashi 1.0.0</p>
-		<a href="index.html"><img src="Pictures/tawashi-icon-new.png" alt="tawashi icon" class="icon"></a>
-		<a href="save.html"><input type="image" src="Pictures/save-ink-t.png" alt="Submit" class="icon-green" title="Save"/></a>
-		<a href="index.html"><img src="Pictures/new-ink-t.png" alt="new icon" class="icon-green" title="New"/></a>
-		<a href=""><img src="Pictures/edit-ink-t.png" alt="duplicate and edit icon" class="icon-green" title="Duplicate and Edit"/></a>
-		<a href=""><img src="Pictures/text-ink-t.png" alt="text icon" class="icon-green" title="Text only"/></a>
-		<img src="Pictures/C++-icon.jpeg" alt="c++ icon" class="icon-right"/>
-		<a href=""><img src="Pictures/github-icon.jpeg" alt="github icon" class="icon-right" /></a>	
-	</div>
+
+	{{> topbar}}

 	<div id="content">
-		<p>{{pastie}}</p>
+		{{pastie}}
 	</div>
-	
+
 </body>
 </html>
--- a/html/topbar.mustache
+++ b/html/topbar.mustache
@ -1,10 +1,11 @@
 	<div id="topbar">
 		<p id="version">tawashi {{version}}</p>
 		<a href="index.html"><img src="Pictures/tawashi-icon-new.png" alt="tawashi icon" class="icon"></a>
-		<a href="save.html"><input type="image" src="Pictures/save-ink-t.png" alt="Submit" class="icon-green" title="Save"/></a>
-		<a href="index.html"><img src="Pictures/new-ink-t.png" alt="new icon" class="icon-green" title="New"/></a>
-		<a href="edit.html"><img src="Pictures/edit-ink-t.png" alt="duplicate and edit icon" class="icon-green" title="Duplicate and Edit"/></a>
-		<a href="text.html"><img src="Pictures/text-ink-t.png" alt="text icon" class="icon-green" title="Text only"/></a>
-		<img src="Pictures/C++-icon.jpeg" alt="c++ icon" class="icon-right"/>
-		<a href=""><img src="Pictures/github-icon.jpeg" alt="github icon" class="icon-right" /></a>	
+		<a href="save.html"><input type="image" src="Pictures/save-ink.png" alt="Submit" class="icon-green" title="Paste"/></a>
+		<a href="index.html"><img src="Pictures/new-ink.png" alt="new icon" class="icon-green" title="New"/></a>
+		<a href="edit.html"><img src="Pictures/edit-ink.png" alt="duplicate and edit icon" class="icon-green" title="Duplicate and Edit"/></a>
+		<a href="text.html"><img src="Pictures/text-ink.png" alt="text icon" class="icon-green" title="Text only"/></a>
+
+		<a href="https://github.com/KingDuckZ/tawashi"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
+
 	</div>