Merge branch 'kaikubasta-master'

templates/accountform.html

@@ -1,12 +1,39 @@
 {{ template "header" }}
-    <h1>edit account</h1>
+<form method="post" action="feeds">
-    <form method="POST" action="/account">
+	<fieldset>
-        E-mail: <input type="text" name="mail" /><br />
+		<legend>Edit account</legend>
-        New password: <input type="password" name="new_password" /><br />
+
-        New password (repeat): <input type="password" name="new_password2" /><br />
+		<div>
-        <br />
+			<label for="mail">New e-mail address</label>
-        Name: <input type="text" name="name" /><br />
+			<input type="email" id="mail" name="mail" aria-describedby="mail-desc"/>
-        Old password: <input type="password" name="password" /><br />
+			<p id="mail-desc">Used for password reset and feed owner authentication.</p>
-        <input type="submit" value="update" />
+		</div>
-    </form>
+		
+		<div>
+			<label for="password">New password</label>
+			<input type="password" id="password" name="new_password" />
+		</div>
+
+		<div>
+			<label for="password2">New password <span>(repeat)</span></label>
+			<input type="password" id="password2" name="new_password2" />
+		</div>
+
+		<hr />
+
+		<div>
+			<label for="name">Name</label>
+			<input type="text" id="name" name="name" maxlength="140" required />
+		</div>
+
+		<div>
+			<label for="password-old">Current password</label>
+			<input type="password" id="password-old" name="password" required />
+		</div>
+
+		<hr />
+
+		<button type="submit">Update</button>
+	</fieldset>
+</form>
 {{ template "footer" }}

templates/css/style.css

@@ -0,0 +1,88 @@
+body {
+	background-color: white;
+	color: black;
+	font: 1rem/1.5 -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Open Sans', 'Helvetica Neue', sans-serif;
+	max-width: 30rem;
+	padding: 0 1rem;
+	margin: 0 auto;	
+}
+
+a {
+	color: #00c;
+}
+
+a:hover {
+	background-color: #00c;
+	color: white;
+}
+
+a:focus {
+	outline: thin solid;
+}
+
+header,
+nav,
+footer {
+	text-align: center;
+}
+
+nav ul {
+	list-style: none;
+	padding-left: 0;
+}
+
+nav li {
+	display: inline-block;
+	margin: 0 .5rem;
+}
+
+section,
+fieldset {
+	background-color: #eee;
+	padding: 1rem;
+	border: 1px solid black;
+}
+
+section.success {
+	background-color: #cfc;
+}
+
+section.error {
+	background-color: #fcc;
+}
+
+section h2:first-child {
+	margin-top: 0;
+}
+
+form div {
+	margin-bottom: 1rem;
+}
+
+form p,
+label span {
+	color: #444;
+	font-size: .8rem;
+}
+
+form p {
+	margin: 0;
+}
+
+legend,
+label {
+	font-weight: bold;
+}
+
+label {
+	display: block;
+}
+
+button,
+input {
+	font-size: 1rem;
+}
+
+input#twt {
+	width: 100%;
+}

templates/error.html

@@ -1,4 +1,6 @@
 {{ template "header" }}
-    <h1>error</h1>
+	<section class="error">
-    <p>Something went wrong: {{ .Msg }}</p>
+		<h2>Error</h2>
+		<p>Something went wrong: {{ .Msg }}</p>
+	</section>
 {{ template "footer" }}

templates/feedset.html

@@ -1,6 +1,6 @@
 {{ template "header" }}
-    <h1>feed setup</h1>
+	<section class="success">
-    <p>
+		<h2>Success</h2>
-    Feed successfully set.
+		<p>Your account has been created.</p>
-    </p>
+	</section>
 {{ template "footer" }}

templates/index.html

@@ -1,12 +1,27 @@
 {{ template "header" }}
-    <h1>publish a twtxt</h1>
+<form method="post" action="feeds">
-    <form method="POST" action="feeds">
+	<fieldset>
-        Message: <input type="text" name="twt" size="140" /><br />
+		<legend>Send tweet</legend>
-        Name: <input type="text" name="name" />
+
-        Password: <input type="password" name="password" /><br />
+		<div>
-        <input type="submit" value="twtxt" />
+			<label for="twt">Message</label>
-    </form>
+			<input type="text" id="twt" name="twt" maxlength="140" placeholder="What’s happening?" aria-describedby="txt-desc" required />
-    No feed yet? <a href="/signup">Create one!</a><br />
+			<p id="txt-desc"><abbr title="Maximum">Max.</abbr> 140 characters</p>
-    Also, check out <a href="/feeds">other people's feeds</a> …<br />
+		</div>
-    Or <a href="/account">edit your account settings</a>.
+
+		<div>
+			<label for="name">Name</label>
+			<input type="text" id="name" name="name" required />
+		</div>
+		
+		<div>
+			<label for="password">Password</label>
+			<input type="password" id="password" name="password" required />
+		</div>
+
+		<hr />
+
+		<button type="submit">Publish</button>
+	</fieldset>
+</form>
 {{ template "footer" }}

templates/list.html

@@ -1,8 +1,10 @@
 {{ template "header" }}
-    <h1>list of feeds</h1>
+<section>
-    <ul>
+	<h2>Feeds</h2>
-    {{ range .Dir }}
+	<ul>
-        <li><a href="/feeds/{{ . }}">{{ . }}</a></li>
+	{{ range .Dir }}
-    {{ end }}
+		<li><a href="/feeds/{{ . }}">{{ . }}</a></li>
-    </ul>
+	{{ end }}
+	</ul>
+</section>
 {{ template "footer" }}

templates/partials.html

@@ -1,10 +1,38 @@
 {{ define "header" }}
-<html>
+<!DOCTYPE html>
-    <a href="/">hosted twtxt server</a>
+<html lang="en">
-    <hr />
+
+<head>
+
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+	<title>hosted twtxt server</title>
+
+	<link rel="stylesheet" type="text/css" href="css/style.css" media="all" />
+
+</head>
+
+<body>
+
+	<header>
+		<h1><a href="/">hosted twtxt server</a></h1>
+	</header>
+
+	<nav>
+		<ul>
+			<li><a href="/feeds">Feeds</a></li>
+			<li><a href="/signup">Create account</a></li>
+			<li><a href="/account">Edit account</a></li>
+		</ul>
+	</nav>
 {{ end }}
 {{ define "footer" }}
-    <hr />
+	<footer>
-    <p>This project is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html">AGPLv3</a>, source code <a href="https://github.com/plomlompom/htwtxt">here</a>.</p>
+		<p>Licensed under <a href="http://www.gnu.org/licenses/agpl-3.0.html" rel="license">AGPLv3</a>. Source code on <a href="https://github.com/plomlompom/htwtxt">GitHub</a>.</p>
+	</footer>
+
+</body>
+
 </html>
 {{ end }}

templates/signupform.html

@@ -1,10 +1,33 @@
 {{ template "header" }}
-    <h1>sign up</h1>
+<form method="post" action="feeds">
-    <form method="POST" action="/signup">
+	<fieldset>
-        Name: <input type="text" name="name" /> (only up to 140 legal chars: A-Z, a-z, 0-1, _)<br />
+		<legend>Create account</legend>
-        Password: <input type="password" name="new_password" /><br />
+
-        Password (repeat): <input type="password" name="new_password2" /><br />
+		<div>
-        E-mail: <input type="text" name="mail" /> (optional; stored internally to reach and/or identify you when there's trouble with your feed, you want to reset your password, etc.; in any such communication, communicating from an address provided here is a necessary condition for you to be treated as the owner of your feed)<br />
+			<label for="name">Name</label>
-        <input type="submit" value="create" />
+			<input type="text" id="name" name="name" maxlength="140" aria-describedby="name-rules" pattern="[a-zA-Z0-9_]{1,140}" required />
-    </form>
+			<p id="name-desc">Legal characters: A-Z, a-z, 0-9, _ (<abbr title="maximum">max.</abbr> 140)</p>
+		</div>
+
+		<div>
+			<label for="mail">E-mail address <span>(optional)</span></label>
+			<input type="email" id="mail" name="mail" aria-describedby="mail-desc"/>
+			<p id="mail-desc">Used for password reset and feed owner authentication.</p>
+		</div>
+		
+		<div>
+			<label for="password">Password</label>
+			<input type="password" id="password" name="new_password" required />
+		</div>
+
+		<div>
+			<label for="password2">Password <span>(repeat)</span></label>
+			<input type="password" id="password2" name="new_password2" required />
+		</div>
+
+		<hr />
+		
+		<button type="submit">Sign up</button>
+	</fieldset>
+</form>
 {{ template "footer" }}