minor CSS fixes following major update

dlareau · Dec 23, 2015 · 5bed945 · 5bed945
1 parent 3fcf050
commit 5bed945
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 21 deletions.
diff --git a/huntserver/static/bootstrap.min.css b/huntserver/static/bootstrap.min.css
diff --git a/huntserver/static/bootstrap.min.js b/huntserver/static/bootstrap.min.js
diff --git a/huntserver/static/huntserver/background.jpg b/huntserver/static/huntserver/background.jpg
diff --git a/huntserver/static/huntserver/base.css b/huntserver/static/huntserver/base.css
@@ -1,5 +1,5 @@
 body {
-    background: url(http://www.millionaireinvestor.asia/images/Background.jpg);
+    background: url(/static/huntserver/background.jpg);
 }
 
 .content {

diff --git a/huntserver/templates/base.html b/huntserver/templates/base.html
@@ -1,14 +1,12 @@
+{% load bootstrap_tags %}
 <!DOCTYPE html>
 <html>
   <head>
     <title>{% block title %} Puzzlehunt! {% endblock title %}</title>
-    <script src="{{ STATIC_URL }}jquery.min.js"></script>
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
-
-    <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}huntserver/base.css">
+    <script src="{{ STATIC_URL }}jquery.min.js"></script>
+    <script src="{{ STATIC_URL }}bootstrap.min.js"></script>
     {% block includes %} {% endblock includes %}
   </head>
   <body>
@@ -32,12 +30,11 @@
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
           <ul class="nav navbar-nav">
             {% block left-header %}
+              <li class='{% active_page request "index" %}'><a href="{% url 'huntserver:index' %}"> Puzzles </a></li>
               {% if user.is_authenticated %}
-                <li class="active"><a href="#">Link </a></li>
-                <li><a href="#">Link</a></li>
-              {% else %}                
-                <li class="active"><a href="#">Link </a></li>
-                <li><a href="#">Link</a></li>
+                <li class='{% active_page request "unlockables" %}'><a href="{% url 'huntserver:unlockables' %}"> Unlockables </a></li>
+                <li class='{% active_page request "chat" %}'><a href="{% url 'huntserver:chat' %}"> Chat </a></li>
+              {% else %}
                 <li><a href="/registration/">Register</a></li>
               {% endif %}
             {% endblock %}

diff --git a/huntserver/templates/registration/login.html b/huntserver/templates/registration/login.html
@@ -2,15 +2,18 @@
 {% load i18n %}
 
 {% block content %}
-<br>
-Please enter your team's username and password:
+<div class="container">
+  <div class="row content">
+    <br>
+    Please enter your team's username and password:
 
-<form method="post" action=".">
-  {% csrf_token %}
-  {{ form.as_p }}
-
-  <input type="submit" value="{% trans 'Log in' %}" />
-  <input type="hidden" name="next" value="{{ next }}" />
-</form>
+    <form method="post" action=".">
+      {% csrf_token %}
+      {{ form.as_p }}
 
+      <input type="submit" value="{% trans 'Log in' %}" />
+      <input type="hidden" name="next" value="{{ next }}" />
+    </form>
+  </div>
+</div>
 {% endblock %} 
diff --git a/huntserver/templatetags/__init__.py b/huntserver/templatetags/__init__.py
diff --git a/huntserver/templatetags/bootstrap_tags.py b/huntserver/templatetags/bootstrap_tags.py
@@ -0,0 +1,12 @@
+from django import template
+register = template.Library()
+
+@register.simple_tag
+def active_page(request, view_name):
+    from django.core.urlresolvers import resolve, Resolver404
+    if not request:
+        return ""
+    try:
+        return "active" if resolve(request.path_info).url_name == view_name else ""
+    except Resolver404:
+        return ""