From 8bc1b7131eed6df556efd1ffcbe9a92f3f60f161 Mon Sep 17 00:00:00 2001
From: oweissbarth
Date: Tue, 11 Mar 2014 13:02:36 +0100
Subject: Changed font to something that hopefully scales better. Made
 login-form input required. Replaced logo png by svg. Added Logout-message.

---
 www/login.php           |  12 ++--
 www/static/login.css    |  13 +++-
 www/static/logo.png     | Bin 121360 -> 5427 bytes
 www/static/logo.svg     | 181 ++++++++++++++++++++++++++++++++++++++++++++++++
 www/static/register.css |   3 +-
 www/static/style.css    |  12 +++-
 6 files changed, 210 insertions(+), 11 deletions(-)
 create mode 100644 www/static/logo.svg

(limited to 'www')

diff --git a/www/login.php b/www/login.php
index 91ef46e..8534887 100644
--- a/www/login.php
+++ b/www/login.php
@@ -18,16 +18,18 @@
 	
 	<div class="login-area">
 		<h1 class="login-area"> Log in </h1>
-		<?php if(isset($_GET['username'])){
+		<?php if(isset($_GET['reason']) && $_GET['reason'] == 'failure' && isset($_GET['username'])){
 			echo '<h1 id="login-error"> Invalid username or password </h1>';
+		}elseif(isset($_GET['reason']) && $_GET['reason'] == 'logout'){
+			echo '<h1 id="logout-message"> Sucessfully logged out.</h1>';
 		}?>
 		<form id="login-form" method='post' action='/login'>
-			<?php if(isset($_GET['username'])){
-				echo '<input type="text" placeholder="username" name="username" id="username-input" class="login-input" value="'.$_GET['username'].'">';
+			<?php if(isset($_GET['reason']) && $_GET['reason'] == 'failure' && isset($_GET['username'])){
+				echo '<input type="text" placeholder="username" name="username" id="username-input" class="login-input" value="'.$_GET['username'].'"required>';
 			}else{
-				echo '<input type="text" placeholder="username" name="username" id="username-input" class="login-input">';
+				echo '<input type="text" placeholder="username" name="username" id="username-input" class="login-input" required>';
 			}?>
-			<input type="password" placeholder="password" name="password" id="password-input" class="login-input">
+			<input type="password" placeholder="password" name="password" id="password-input" class="login-input" required>
 			
 			<input type="submit" name="login" id="button-input" class="login-input" value="login">
 			<a href="recover-password.php" id="recover-password-link">recover password</a>
diff --git a/www/static/login.css b/www/static/login.css
index 2a81a0d..549e307 100644
--- a/www/static/login.css
+++ b/www/static/login.css
@@ -1,3 +1,4 @@
+@import url(http://fonts.googleapis.com/css?family=Alegreya+Sans+SC:300);
 /*********************************************************
 				Login-Form
 **********************************************************/
@@ -20,7 +21,7 @@ div.login-area{
 
 h1.login-area{
 	font-size: 32px;
-	font-weight: 200;
+	font-weight: normal;
 	display:inline;
 }
 
@@ -63,5 +64,13 @@ input.login-input:focus{
 	text-align:right;
 	float:right;
 	line-height: 32px;
-	outline: 3px solid #1F3D4C;
+	border: 3px solid #1F3D4C;
+}
+
+#logout-message{
+	font-size: 13pt;
+	text-align:right;
+	float:right;
+	line-height: 32px;
+	border: 3px solid #1F3D4C;
 }
diff --git a/www/static/logo.png b/www/static/logo.png
index c1be2fa..cb99923 100644
Binary files a/www/static/logo.png and b/www/static/logo.png differ
diff --git a/www/static/logo.svg b/www/static/logo.svg
new file mode 100644
index 0000000..86a5c1e
--- /dev/null
+++ b/www/static/logo.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="354.33069"
+   height="354.33069"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="logo.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="-88.2449"
+     inkscape:cy="319.94841"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="841"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     units="cm" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-698.03017)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 179.31029,742.59093 c -73.69749,0 -133.444069,59.74657 -133.444069,133.44405 0,73.69749 59.746579,133.44412 133.444069,133.44412 73.69748,0 133.44406,-59.74663 133.44406,-133.44412 l -24.22478,0 c -0.25672,60.8875 -49.27199,110.17498 -109.69712,110.17498 -60.58405,0 -109.697139,-49.54424 -109.697139,-110.65283 0,-61.10858 49.113089,-110.65281 109.697139,-110.65281 60.53171,0 109.62317,49.4724 109.69712,110.52816 l -109.69712,0.12465 109.69712,0 c 0,0.11151 3.3e-4,0.22099 0,0.33242 l 24.22478,-0.0207 C 312.66441,802.23504 252.94412,742.59096 179.31029,742.59096 z"
+       id="path2989"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="rect3761"
+       width="60.784557"
+       height="64.58358"
+       x="149.39882"
+       y="700.61194"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="rect3761-1"
+       width="60.784557"
+       height="64.58358"
+       x="149.39882"
+       y="986.29938"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       y="840.41644"
+       x="5.0354896"
+       height="64.58358"
+       width="60.784557"
+       id="rect3793"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       y="842.31598"
+       x="288.06357"
+       height="64.58358"
+       width="60.784557"
+       id="rect3793-0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       y="715.9671"
+       x="-380.66989"
+       height="64.58358"
+       width="60.784557"
+       id="rect3793-7"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       y="711.93762"
+       x="-666.76331"
+       height="64.58358"
+       width="60.784557"
+       id="rect3793-7-4"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       y="570.90564"
+       x="-524.38818"
+       height="64.58358"
+       width="60.784557"
+       id="rect3793-7-4-5"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <rect
+       y="860.35706"
+       x="-523.71661"
+       height="64.58358"
+       width="60.784557"
+       id="rect3793-7-4-8"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655" />
+    <g
+       transform="matrix(12.274015,0,0,23.895597,-3209.3606,-10250.432)"
+       style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       id="flowRoot3888">
+      <path
+         d="m 272.9675,467.60756 c -0.056,0 -0.102,-0.01 -0.138,-0.03 -0.032,-0.024 -0.058,-0.068 -0.078,-0.132 l -1.2,-3.75 c -0.032,-0.112 0.01,-0.168 0.126,-0.168 l 0.294,0 c 0.108,0 0.176,0.048 0.204,0.144 l 0.942,3.174 c 0.012,0.044 0.032,0.066 0.06,0.066 0.028,0 0.048,-0.022 0.06,-0.066 l 0.942,-3.174 c 0.028,-0.096 0.096,-0.144 0.204,-0.144 l 0.294,0 c 0.116,0 0.158,0.056 0.126,0.168 l -1.2,3.75 c -0.02,0.064 -0.048,0.108 -0.084,0.132 -0.032,0.02 -0.076,0.03 -0.132,0.03 l -0.42,0"
+         style="font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;text-anchor:start;fill:#ffffff;font-family:SciFly;-inkscape-font-specification:SciFly Bold"
+         id="path3776" />
+      <path
+         d="m 275.51797,467.60756 c -0.056,0 -0.1,-0.016 -0.132,-0.048 -0.032,-0.032 -0.048,-0.076 -0.048,-0.132 l 0,-3.72 c 0,-0.056 0.016,-0.1 0.048,-0.132 0.032,-0.032 0.076,-0.048 0.132,-0.048 l 2.1,0 c 0.056,0 0.1,0.016 0.132,0.048 0.032,0.032 0.048,0.076 0.048,0.132 l 0,0.18 c 0,0.056 -0.016,0.1 -0.048,0.132 -0.032,0.032 -0.076,0.048 -0.132,0.048 l -1.65,0 c -0.04,0 -0.06,0.02 -0.06,0.06 l 0,1.14 c 0,0.04 0.02,0.06 0.06,0.06 l 1.41,0 c 0.056,0 0.1,0.016 0.132,0.048 0.032,0.032 0.048,0.076 0.048,0.132 l 0,0.18 c 0,0.056 -0.016,0.1 -0.048,0.132 -0.032,0.032 -0.076,0.048 -0.132,0.048 l -1.41,0 c -0.04,0 -0.06,0.02 -0.06,0.06 l 0,1.5 c 0,0.056 -0.016,0.1 -0.048,0.132 -0.032,0.032 -0.076,0.048 -0.132,0.048 l -0.21,0"
+         style="font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;text-anchor:start;fill:#ffffff;font-family:SciFly;-inkscape-font-specification:SciFly Bold"
+         id="path3778" />
+      <path
+         d="m 278.38081,466.84556 c 0.04,-0.04 0.082,-0.058 0.126,-0.054 0.048,0.004 0.09,0.022 0.126,0.054 0.032,0.028 0.068,0.06 0.108,0.096 0.04,0.032 0.086,0.062 0.138,0.09 0.052,0.028 0.112,0.052 0.18,0.072 0.068,0.016 0.146,0.024 0.234,0.024 0.192,0 0.35,-0.052 0.474,-0.156 0.124,-0.108 0.186,-0.242 0.186,-0.402 0,-0.18 -0.056,-0.324 -0.168,-0.432 -0.108,-0.108 -0.282,-0.22 -0.522,-0.336 -0.152,-0.072 -0.29,-0.148 -0.414,-0.228 -0.12,-0.08 -0.224,-0.17 -0.312,-0.27 -0.088,-0.1 -0.156,-0.212 -0.204,-0.336 -0.044,-0.128 -0.066,-0.274 -0.066,-0.438 0,-0.136 0.026,-0.268 0.078,-0.396 0.052,-0.128 0.128,-0.24 0.228,-0.336 0.1,-0.1 0.22,-0.18 0.36,-0.24 0.144,-0.06 0.304,-0.09 0.48,-0.09 0.228,0 0.422,0.044 0.582,0.132 0.164,0.088 0.294,0.18 0.39,0.276 0.084,0.084 0.084,0.168 0,0.252 l -0.138,0.144 c -0.04,0.04 -0.078,0.062 -0.114,0.066 -0.036,0 -0.078,-0.022 -0.126,-0.066 -0.052,-0.048 -0.132,-0.104 -0.24,-0.168 -0.108,-0.064 -0.226,-0.096 -0.354,-0.096 -0.088,0 -0.17,0.016 -0.246,0.048 -0.072,0.028 -0.136,0.066 -0.192,0.114 -0.052,0.048 -0.094,0.104 -0.126,0.168 -0.028,0.06 -0.042,0.124 -0.042,0.192 0,0.088 0.012,0.166 0.036,0.234 0.028,0.068 0.068,0.132 0.12,0.192 0.056,0.056 0.126,0.11 0.21,0.162 0.088,0.052 0.194,0.104 0.318,0.156 0.164,0.072 0.31,0.148 0.438,0.228 0.128,0.08 0.236,0.17 0.324,0.27 0.088,0.096 0.154,0.208 0.198,0.336 0.048,0.124 0.072,0.268 0.072,0.432 0,0.152 -0.032,0.296 -0.096,0.432 -0.064,0.136 -0.152,0.256 -0.264,0.36 -0.112,0.1 -0.244,0.182 -0.396,0.246 -0.148,0.06 -0.306,0.09 -0.474,0.09 -0.272,0 -0.486,-0.04 -0.642,-0.12 -0.152,-0.084 -0.286,-0.19 -0.402,-0.318 -0.032,-0.032 -0.05,-0.072 -0.054,-0.12 -0.004,-0.048 0.014,-0.092 0.054,-0.132 l 0.132,-0.132"
+         style="font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;text-anchor:start;fill:#ffffff;font-family:SciFly;-inkscape-font-specification:SciFly Bold"
+         id="path3780" />
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3896"
+       style="font-size:6px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       inkscape:export-filename="/home/oliver/Pictures/Logos/vfs/draft_1.png"
+       inkscape:export-xdpi="499.96655"
+       inkscape:export-ydpi="499.96655"><flowRegion
+         id="flowRegion3898"><rect
+           id="rect3900"
+           width="94.285713"
+           height="18.571428"
+           x="200"
+           y="452.36218" /></flowRegion><flowPara
+         id="flowPara3902" /></flowRoot>  </g>
+</svg>
diff --git a/www/static/register.css b/www/static/register.css
index 58f645d..76f07ac 100644
--- a/www/static/register.css
+++ b/www/static/register.css
@@ -1,3 +1,4 @@
+@import url(http://fonts.googleapis.com/css?family=Alegreya+Sans+SC:300);
 /*********************************************************
 				Register-Form
 **********************************************************/
@@ -19,7 +20,7 @@ div.register-area{
 }
 
 h1.register-area{
-	font-weight: 200;
+	font-weight: normal;
 }
 
 form.register-form{
diff --git a/www/static/style.css b/www/static/style.css
index 65c97f6..b7c00df 100644
--- a/www/static/style.css
+++ b/www/static/style.css
@@ -1,3 +1,5 @@
+@import url(http://fonts.googleapis.com/css?family=Alegreya+Sans+SC:300);
+
 /***************************************************************
 					General Page Styling
 ****************************************************************/
@@ -7,7 +9,10 @@
 }
 html, body{
 	height: 100%;
-	font-family: Impact, Charcoal, sans-serif;
+	font-family: 'Alegreya Sans SC', sans-serif;
+	-webkit-font-smoothing: antialiased;
+	-ms-font-smoothing: antialiased;
+	font-smoothing: antialiased;
 }
 
 
@@ -28,7 +33,7 @@ a.logo{
 	width: 70px;
 	margin-top: 5px;
 	margin-left: 5px;
-	background-image: url(./logo.png);
+	background-image: url(./logo.svg);
 	background-repeat:no-repeat;
 	background-size:66px 66px;
 	background-color:#3083D6;
@@ -42,7 +47,7 @@ a.logo{
 a.logo:hover{
 	display: block;
 	background:#2669AB;
-	background-image: url(./logo.png);
+	background-image: url(./logo.svg);
 	background-repeat:no-repeat;
 	background-size:66px 66px;
 	background-position: center;
@@ -93,5 +98,6 @@ footer{
 	margin-right: 10px;
 	text-align: right;
 	font-size: 12px;
+	font-weight: normal;
 	color: white;
 }
-- 
cgit v1.2.3