From 5e8d90a0c989c10264002ae79d06b881d4c12515 Mon Sep 17 00:00:00 2001 From: Carlos Oliveira Date: Thu, 3 Sep 2015 17:46:10 -0300 Subject: [PATCH] Cleaned up HTML and extracted header --- colab/templates/base.html | 84 +++--------------------------------------------------------------------------------- colab/templates/header.html | 10 ++++------ 2 files changed, 7 insertions(+), 87 deletions(-) diff --git a/colab/templates/base.html b/colab/templates/base.html index e7da58f..17dd1bb 100644 --- a/colab/templates/base.html +++ b/colab/templates/base.html @@ -50,7 +50,7 @@ - + {% block ribbon %} {% if ribbon %} @@ -62,84 +62,8 @@ {% endif %} {% endblock %} - {% block navbar %} - - + {% block header %} + {% include 'header.html' %} {% endblock %} {% block messages %} @@ -166,8 +90,6 @@ {% block main-content %}{% endblock %} -
 
- {% block footer %} {% include "footer.html" %} diff --git a/colab/templates/header.html b/colab/templates/header.html index aa7e582..5405847 100644 --- a/colab/templates/header.html +++ b/colab/templates/header.html @@ -23,8 +23,6 @@ {% plugins_menu %} -
  • {% trans "Paste" %}
  • - @@ -42,8 +40,8 @@ {% trans 'Login' as login_text %} - - + + {% else %}