Merge branch 'master' of github.com:asmaps/nsupdate.info

Conflicts:
	nsupdate/main/templates/main/about.html
	nsupdate/main/urls.py
	nsupdate/nsupdate/templates/base.html

nsupdate/main/templates/main/about.html

@@ -2,7 +2,9 @@
 {% load bootstrap %}
 
 {% block content %}
-<h1>About nsupdate.info</h1>
+<h1>About page</h1>
+<p>You take the blue pill, the story ends, you wake up in your bed and believe whatever you want to believe. You take the red pill, you stay in Wonderland, and I show you how deep the rabbit hole goes.</p>
+<h2>About nsupdate.info</h2>
 <p>nsupdate.info is the idea of a really simple single purpose dynamic dns 
 service. Unlike other dynamic dns services its intention is that you do not
 have to click a link every 30 days to keep your domain enabled or other 

nsupdate/main/templates/main/help.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load bootstrap %}
+
+{% block content %}
+
+    <div class="row">
+        <h1>Help / FAQ</h1>
+         I am the Architect. I created the Matrix. I've been waiting for you. You have many questions, and although the process has altered your consciousness, you remain irrevocably human. Ergo, some of my answers you will understand, and some of them you will not. Concordantly, while your first question may be the most pertinent, you may or may not realize it is also the most irrelevant.
+    </div>
+    
+
+{% endblock %}

nsupdate/main/urls.py

@@ -1,14 +1,14 @@
 from django.conf.urls import patterns, url
 from main.views import (
-    HomeView, OverviewView, HostView, DeleteHostView, AboutView)
+    HomeView, OverviewView, HostView, DeleteHostView, AboutView, HelpView)
 from api.views import (
     MyIpView, DetectIpView, NicUpdateView, AuthorizedNicUpdateView)
 
-
 urlpatterns = patterns(
     '',
     url(r'^$', HomeView.as_view(), name="home"),
     url(r'^about/$', AboutView.as_view(), name="about"),
+    url(r'^help/$', HelpView.as_view(), name="help"),
     url(r'^overview/$', OverviewView.as_view(), name='overview'),
     url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
     url(r'^host/(?P<pk>\d+)/delete/$',

nsupdate/main/views.py

@@ -40,6 +40,24 @@ class HomeView(TemplateView):
         return context
 
 
+class HelpView(TemplateView):
+    template_name = "main/help.html"
+
+    def get_context_data(self, *args, **kwargs):
+        context = super(HelpView, self).get_context_data(*args, **kwargs)
+        context['nav_help'] = True
+        return context
+
+
+class AboutView(TemplateView):
+    template_name = "main/about.html"
+
+    def get_context_data(self, *args, **kwargs):
+        context = super(AboutView, self).get_context_data(*args, **kwargs)
+        context['nav_about'] = True
+        return context
+
+
 class OverviewView(CreateView):
     model = Host
     template_name = "main/overview.html"

nsupdate/nsupdate/templates/base.html

@@ -38,6 +38,9 @@
                         <li{% if nav_about %} class="active"{% endif %}>
                             <a href="{% url 'about' %}">About</a>
                         </li>
+                        <li{% if nav_help %} class="active"{% endif %}>
+                            <a href="{% url 'help' %}">Help</a>
+                        </li>
                     </ul>
                     <ul class="nav navbar-nav pull-right">
                         {% if not request.user.is_authenticated %}