Merge branch 'master' of git.iamfabulous.de:files.iamfabulous.de

4 files changed, 27 insertions, 3 deletions

diff --git a/www/404.php b/www/404.php
new file mode 100644
index 0000000..ab926bf
--- /dev/null
+++ b/www/404.php
@@ -0,0 +1,7 @@
+<?php include("static/header.html");?>
+	<link rel="stylesheet" type="text/css" href="static/404.css">
+<div id="Error-Page-content">
+	<h1 id="Error-Page-head" >404</h1>
+	<h2 id="Error-Page-description" >Wow! I didn&#39t see that coming...Well, I&#39m sorry...</h2>
+</div>
+<?php include("static/footer.html");?>
diff --git a/www/functions.php b/www/functions.php
index d3892bb..f301cea 100644
--- a/www/functions.php
+++ b/www/functions.php
@@ -259,8 +259,9 @@ function register($db){
 /* --PAGE NOT FOUND - 404 -- */
 
 function get_404(){
-	echo "Sorry, page not found. <br>";
+//	echo "Sorry, page not found. <br>";
 //	select($db);
+	include("404.php");
 	exit;
 }
 
diff --git a/www/static/404.css b/www/static/404.css
new file mode 100644
index 0000000..3567ae4
--- /dev/null
+++ b/www/static/404.css
@@ -0,0 +1,18 @@
+#Error-Page-content{
+	margin-left: auto;
+	margin-right: auto;
+	top: 50%;
+	margin-top: -200px;
+	width: 600px;
+	height: 400px;
+	text-align: center;
+	position: relative;
+}
+
+#Error-Page-head{
+	font-size: 120pt;
+}
+
+#Error-Page-description{
+
+}
diff --git a/www/static/login.css b/www/static/login.css
index 6697bcc..2685b4c 100644
--- a/www/static/login.css
+++ b/www/static/login.css
@@ -29,7 +29,6 @@ h1.login-area{
 	margin:0;
 	border: none;
 	position: static;
-	
 }
 
 h1.login-area{
@@ -37,7 +36,6 @@ h1.login-area{
 	font-weight: normal;
 	line-height: 32px;
 	padding:0;
-	float: left;
 	display: inline-block;
 }