From 6026af24f9665b06603e5126fdc3f25944d78291 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 28 Dec 2015 12:36:05 +0000
Subject: [PATCH] Added about me page

---
 project/pages/urls.py        |  1 +
 project/pages/views.py       |  4 ++++
 project/urls.py              |  1 -
 templates/about/index.html   |  6 +++---
 templates/about/me.html      | 15 +++++++++++++++
 templates/about/website.html |  8 ++++----
 6 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 templates/about/me.html

diff --git a/project/pages/urls.py b/project/pages/urls.py
index 2ced6c6..bdac39a 100644
--- a/project/pages/urls.py
+++ b/project/pages/urls.py
@@ -4,6 +4,7 @@ from . import views
 
 urlpatterns = [
     url(r'^about/website/$', views.AboutWebsiteView.as_view(), name='about-website'),
+    url(r'^about/me/$', views.AboutMeView.as_view(), name='about-me'),
     url(r'^about/$', views.AboutIndexView.as_view(), name='about'),
     url(r'^$', views.IndexView.as_view(), name='index')
 ]
diff --git a/project/pages/views.py b/project/pages/views.py
index 9abee43..0df5e29 100644
--- a/project/pages/views.py
+++ b/project/pages/views.py
@@ -32,3 +32,7 @@ class AboutWebsiteView(CustomTemplate):
 class AboutIndexView(CustomTemplate):
     template_name = 'about/index.html'
     html_title = "About"
+
+class AboutMeView(CustomTemplate):
+    template_name = 'about/me.html'
+    html_title = "About Me"
diff --git a/project/urls.py b/project/urls.py
index 89c7c3a..207aa27 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -6,7 +6,6 @@ from project.pages.views import Custom404View, NoJavascriptView
 urlpatterns = [
     url(r'^site-admin/', include(admin.site.urls)),
     url(r'^404/', Custom404View.as_view(), name="404"),
-    url(r'^404/', Custom404View.as_view(), name="404"),
     url(r'^no-js/', NoJavascriptView.as_view(), name="no-js"),
     url(r'', include('project.pages.urls', namespace='pages'))
 ]
diff --git a/templates/about/index.html b/templates/about/index.html
index e849212..afd11ca 100644
--- a/templates/about/index.html
+++ b/templates/about/index.html
@@ -14,7 +14,7 @@
   <div class="row">
     <div class="col-sm-6">
       <div class="thumbnail">
-        <img src="" alt="" />
+        <img src="http://cdn2.itpro.co.uk/sites/itpro/files/server_room.jpg" alt="Server Image" />
         <div class="caption">
           <h3>About Website</h3>
           <p>
@@ -32,10 +32,10 @@
         <div class="caption">
           <h3>About Me</h3>
           <p>
-            Some info about me.
+            Some info about me. Although not very much
           </p>
           <p>
-            <a href="" class="btn btn-primary btn-block">More Info</a>
+            <a href="{% url 'pages:about-me' %}" class="btn btn-primary btn-block">More Info</a>
           </p>
         </div>
       </div>
diff --git a/templates/about/me.html b/templates/about/me.html
new file mode 100644
index 0000000..3d68eb1
--- /dev/null
+++ b/templates/about/me.html
@@ -0,0 +1,15 @@
+{% extends 'content_base.html' %}
+
+{% block pageTitle %}About Me{% endblock %}
+
+{% block content %}
+<div class="container">
+  <div class="panel panel-default">
+    <div class="panel-body">
+      <p>
+      </p>
+    </div>
+  </div>
+</div>
+
+{% endblock %}
diff --git a/templates/about/website.html b/templates/about/website.html
index aeab3b2..46c779b 100644
--- a/templates/about/website.html
+++ b/templates/about/website.html
@@ -7,11 +7,11 @@
   <div class="panel panel-default">
     <div class="panel-body">
       <p>
-        My website is the culmination of all my knowledge, compiled into 1 place. It not only contains all my projects, but it in itself is a project. Making sure this website works properly is a tall order, especially considering it's self hosted. And making sure that it stays secure is also important, as it contains a large amount of personal information. 
+        My website is the culmination of all my knowledge, compiled into 1 place. It not only contains all my projects, but it in itself is a project. Making sure this website works properly is a tall order, especially considering it's self hosted. And making sure that it stays secure is also important, as it contains a large amount of personal information.
       </p>
     </div>
   </div>
-</div>  
+</div>
 
 <div class="container">
   <div class="panel panel-default">
@@ -24,7 +24,7 @@
       </p>
       <p>
         I went with the Django framework because it's what I work with at work, so I have a lot of contact with it, so exposure to bugs or clean ways to write things happen on a daily basis. I also chose it because it's written in python, one of my favourite languages, and one i'm highly fluent in. I chose PostgreSQL as a database engine because it's again what we use at work, and I already had some files preconfigured with the required config.
-      </p> 
+      </p>
     </div>
   </div>
   <div class="panel panel-default">
@@ -38,4 +38,4 @@
     </div>
   </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}