Active menu markings

mewwts · Sep 21, 2013 · 10e9a53 · 10e9a53
1 parent 15b856c
commit 10e9a53
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/bandpage/templates/bandpage/base.html b/bandpage/templates/bandpage/base.html
@@ -1,5 +1,6 @@
 {% load staticfiles %}
-{% load i18n %}<!DOCTYPE html>
+{% load i18n %}
+{% load activelink %}<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -33,16 +34,16 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="/">{{ band_name }}</a>
+                    <a class="navbar-brand{% block frontpageActiveHack %}{% endblock %}" href="/">{{ band_name }}</a>
                 </div>
 
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav">
-                        <li><a href="{% url 'concerts:index' %}">{% trans "Concerts" %}</a></li>
-                        <li><a href="{% url 'music:index' %}">{% trans "Music" %}</a></li>
-                        <li><a href="{% url 'photos:index' %}">{% trans "Photos" %}</a></li>
-                        <li><a href="{% url 'videos:index' %}">{% trans "Videos" %}</a></li>
-                        <li><a href="{% url 'music:lyrics' %}">{% trans "Lyrics" %}</a></li>
+                        <li><a href="{% url 'concerts:index' %}"{% ifactive 'concerts:index' %} class="active" {% endifactive %}>{% trans "Concerts" %}</a></li>
+                        <li><a href="{% url 'music:index' %}"{% ifactive 'music:index' %} class="active" {% endifactive %}>{% trans "Music" %}</a></li>
+                        <li><a href="{% url 'photos:index' %}"{% ifactive 'photos:index' %} class="active" {% endifactive %}>{% trans "Photos" %}</a></li>
+                        <li><a href="{% url 'videos:index' %}"{% ifactive 'videos:index' %} class="active" {% endifactive %}>{% trans "Videos" %}</a></li>
+                        <li><a href="{% url 'music:lyrics' %}"{% ifactive 'music:lyrics' %} class="active" {% endifactive %}>{% trans "Lyrics" %}</a></li>
                         <li><a href="{{ twitter_url }}">Twitter</a></li>
                         <li><a href="{{ facebook_url }}">Facebook</a></li>
                     </ul>

diff --git a/landingpage/templates/landingpage/index.html b/landingpage/templates/landingpage/index.html
@@ -5,6 +5,8 @@
 
 {% block body_id %} id="landingpage" class="{{ landingpage.theme }}"{% endblock body_id %}
 
+{% block frontpageActiveHack %} active {% endblock %}
+
 {% block content %}
 
     {% if landingpage %}

diff --git a/static/styles/bootstrap.css b/static/styles/bootstrap.css
@@ -5449,12 +5449,10 @@ body.modal-open,
     padding-top: 0;
   }
 }
-/*  Animations
--------------------------- */
 /*  Generic styles
 -------------------------- */
 body {
-  background: #e8e8e8;
+  background: #f5f5f5;
 }
 a {
   text-decoration: none;
@@ -5489,6 +5487,9 @@ header .navbar a {
   -o-transition: color 0.2s ease-out;
   transition: color 0.2s ease-out;
 }
+header .navbar a.active {
+  color: white;
+}
 /*  Page
 -------------------------- */
 section {
@@ -5497,9 +5498,10 @@ section {
   color: #404040;
 }
 footer {
-  background: #e8e8e8;
+  background: #f5f5f5;
   padding: 40px 0;
-  color: #292929;
+  color: #363636;
+  border-top: 2px solid #e8e8e8;
 }
 footer #contact-info {
   margin-left: -15px;
@@ -5538,6 +5540,13 @@ footer #contact-info #promo {
   padding-left: 15px;
   padding-right: 15px;
 }
+footer #contact-info #booking h3,
+footer #contact-info #promo h3 {
+  font-size: 1em;
+  font-weight: bold;
+  line-height: 1.375em;
+  margin: 0;
+}
 /*  Page specific: Landingpage
 -------------------------- */
 @-webkit-keyframes scaleFade {
@@ -5661,7 +5670,7 @@ body#landingpage.dark {
 }
 body#landingpage.dark h1,
 body#landingpage.dark p {
-  color: #e8e8e8;
+  color: #f5f5f5;
   text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
 }
 body#landingpage.dark header {