Clean up html.

6 files changed, 20 insertions, 17 deletions

diff --git a/cli/imgup/main.go b/cli/imgup/main.go
index 660d07c..299a09f 100644
--- a/cli/imgup/main.go
+++ b/cli/imgup/main.go
@@ -9,7 +9,7 @@ import (
 /* TODO: Make this configurable. */
 
 //var apiHost = "http://127.0.0.1:8080"
-var apiHost = "http://images.iamfabulous.de"
+var apiHost = "https://images.iamfabulous.de"
 var apiUrl = apiHost + "/api/v1/"
 
 func main() {
diff --git a/run.sh b/run.sh
index 7c20eaa..35e114a 100755
--- a/run.sh
+++ b/run.sh
@@ -26,6 +26,6 @@ export PORT=8087
 STATIC_DIR=$(pwd)/static \
 IMGUR_GO_CONF=$(pwd)/config/conf.json \
 UPLOAD_DIR=$(pwd)/files \
-UPLOAD_URL=http://i.iamfabulous.de:8080 \
+UPLOAD_URL=http://i.iamfabulous.de \
 ORIGIN_URL=https://images.iamfabulous.de \
 ./$APP 
diff --git a/templates/404.html b/templates/404.html
index 0be97a5..00b0397 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,4 +1,4 @@
-{{template "header.html" "Not Found"}}
+{{template "header.html" "Not Found | Mandible"}}
 {{template "navbar.html"}}
 
 <div class="jumbotron">
diff --git a/templates/api.html b/templates/api.html
index 2e11e55..b097225 100644
--- a/templates/api.html
+++ b/templates/api.html
@@ -1,4 +1,4 @@
-{{template "header.html" "Upload images from file!"}}
+{{template "header.html" "API documentation | Mandible"}}
 {{template "navbar.html"}}
 {{template "modal_uploaded.html"}}
 {{template "modal_error.html"}}
diff --git a/templates/cli.html b/templates/cli.html
index 0ce7535..31a3a9c 100644
--- a/templates/cli.html
+++ b/templates/cli.html
@@ -1,4 +1,4 @@
-{{template "header.html" "Upload images from file!"}}
+{{template "header.html" "CLI documentation | Mandible"}}
 {{template "navbar.html"}}
 {{template "modal_uploaded.html"}}
 {{template "modal_error.html"}}
@@ -10,42 +10,45 @@
 			<h1>Imgup - CLI</h1>
 			<p>Upload your images comfortable from the command line!</p>
 
-			<blockquote>
-				<h2>Usage:</h2>
-				<p><code>imgup [FILE] [URL]</code></h2></p>
-				<p>File have to be the path to a valid image file. Url must start with 'http://' or 'https://'</p>
-			</blockquote>
 
 			<h2>Installation:</h2>
 
 			<blockquote>
 				<h2>Download:</h2>
 				<p>Download the precompiled binary from here: </p> 
-				<p><a href="http://bin.iamfabulous.de/imgup/">bin.iamfabulous.de/imgup</a></p>
-				<p>Currently there is only Linux x86_64 available.</p>
+				<p><a href="https://bin.iamfabulous.de/imgup/" title="Downloads for binaries">bin.iamfabulous.de/imgup</a></p>
+				<p>Currently it is only for Linux x86_64 available.</p>
 			</blockquote>
 
 			<blockquote>
 				<h2>Compiling from source:</h2>
-				<p>You can compile imgup from source. You need a working Golang installation set up. Read <a href="http://golang.org/" title="Golang">here</a> more.</p>
+				<p>You can compile imgup from source. You need a working Golang installation already set up. Read <a href="http://golang.org/" title="Golang">here</a> more.</p>
 				<p><code>cd $GOPATH <br>
 					git clone https://git.iamfabulous.de/cgit.cgi/mandible <br>
 					cd mandible/cli/imgup <br>
 					go build
 				</code></p>
-				<p>You have a working binary now.</p>
+				<p>You are finished. Now you can start using imgup.</p>
 			</blockquote>
 
-			<h2>Example Usage:</h2>
+			<h2>Usage:</h2>
 
 			<blockquote>
-			<p><pre><code>$ imgup http://i.imgur.com/s9zxmYe.jpg
+				<p><code>imgup [FILE] [URL]</code></h2></p>
+				<p>File have to be the path to a valid image file. Url must start with 'http://' or 'https://'.</p>
+			</blockquote>
+
+
+			<blockquote>
+				<h2>Example Usage:</h2>
+				<p><pre><code>$ imgup http://i.imgur.com/s9zxmYe.jpg
 Your image (http://i.imgur.com/s9zxmYe.jpg) was uploaded!
 			
 Follow this link: 
   http://i.iamfabulous.de:8080/i/h/M/hMKg2qS
 			  
 Have a nice day!</code></pre></p>
+			</blockquote>
 		</div>
 	</div>
 </div>
diff --git a/templates/index.html b/templates/index.html
index 2e64de8..f47e82e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,4 +1,4 @@
-{{template "header.html" "Image uploader"}}
+{{template "header.html" "Image uploader | Mandible"}}
 {{template "navbar.html"}}
 {{template "modal_uploaded.html"}}
 {{template "modal_error.html"}}