From 9d5022533bfa5a6883417b81bee54619a40c3604 Mon Sep 17 00:00:00 2001
From: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Date: Wed, 20 May 2015 09:38:10 -0300
Subject: [PATCH] Remove header and footer html to another file

---
 colab/templates/base.html   | 117 +++++----------------------------------------------------------------------------------------------------------------
 colab/templates/footer.html |  19 +++++++++++++++++++
 colab/templates/header.html | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+), 112 deletions(-)
 create mode 100644 colab/templates/footer.html
 create mode 100644 colab/templates/header.html

diff --git a/colab/templates/base.html b/colab/templates/base.html
index ed218f1..1690b9c 100644
--- a/colab/templates/base.html
+++ b/colab/templates/base.html
@@ -70,102 +70,8 @@
     {% endblock %}
 
     {% block navbar %}
-    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-      <div class="container">
-        <div class="navbar-header">
-
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
-        </div>
-        <div class="collapse navbar-collapse navbar-main">
-          <ul class="nav navbar-nav">
-
-            <li>
-              <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
-            </li>
-
-            {% if feedzilla %}
-            <li>
-              <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
-            </li>
-            {% endif %}
-
-            {% proxy_menu %}
-
-            <li><a href="/paste">{% trans "Paste" %}</a></li>
-
-            <li class="hidden-lg hidden-md">
-              <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
-            </li>
-          </ul>
-
-          <ul class="nav navbar-nav navbar-right">
-            {% if not user.is_authenticated %}
-
-              <li class="dropdown hidden-xs hidden-lg">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  {% trans 'Login' as login_text %}
-                  {% if BROWSERID_ENABLED %}
-                    <li>{% browserid_login text=login_text %}</li>
-                  {% else %}
-                    <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
-                    <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
-                  {% endif %}
-                </ul>
-              </li>
-              {% trans 'Login' as login_text %}
-              {% if BROWSERID_ENABLED %}
-                <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
-              {% else %}
-                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
-                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
-              {% endif %}
-            {% else %}
-              <li id="user-menu" class="dropdown">
-                <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
-                <ul class="dropdown-menu" role="menu">
-                  <li>
-                    <div class="wrapper">
-                      <div class="thumbnail">{% gravatar user.email 100 %}</div>
-                      <div class="user-info">
-                        <span><b>{{ user.get_full_name }}</b></span>
-                        <span class="quiet">{{ user.email }}</span>
-                      </div>
-                      <div>
-                        <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
-                        {% trans 'Logout' as logout_text %}
-                        {% if BROWSERID_ENABLED %}
-                          {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
-                        {% else %}
-                          <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
-                        {% endif %}
-                      </div>
-                    </div>
-                  </li>
-                </ul>
-              </li>
-            {% endif %}
-          </ul>
-
-          <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
-            <div class="form-group">
-              <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
-              <input name="q" id="header-searchbox"
-                     class="form-control" value="{{ request.GET.q }}"
-                     type="search" placeholder="{% trans 'Search here...' %}" />
-            </div>
-            <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-          </form>
-        </div>
-      </div>
-    </nav>
+
+      {% include "header.html" %}
 
     {% endblock %}
 
@@ -196,22 +102,9 @@
     <div class="row">&nbsp;</div>
 
     {% block footer %}
-    <div class="footer row">
-      {% if user.is_staff %}
-      <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
-      {% endif %}
-      <p class="col-lg-12 text-center">
-        <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
-        <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
-      </p>
-      <p class="col-lg-12 text-center">
-        {% trans "The contents of this site is published under license" %}:
-        <br>
-        <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">
-          {% trans "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual" %}.
-        </a>
-      </p>
-    </div>
+
+      {% include "footer.html" %}
+
     {% endblock %}
 
   {% if not is_mobile %}
diff --git a/colab/templates/footer.html b/colab/templates/footer.html
new file mode 100644
index 0000000..d6e710d
--- /dev/null
+++ b/colab/templates/footer.html
@@ -0,0 +1,19 @@
+{% load i18n browserid conversejs gravatar proxy %}
+{% load static from staticfiles %}
+
+<div class="footer row">
+  {% if user.is_staff %}
+  <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
+  {% endif %}
+  <p class="col-lg-12 text-center">
+    <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
+    <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
+  </p>
+  <p class="col-lg-12 text-center">
+    {% trans "The contents of this site is published under license" %}:
+    <br>
+    <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">
+      {% trans "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual" %}.
+    </a>
+  </p>
+</div>
diff --git a/colab/templates/header.html b/colab/templates/header.html
new file mode 100644
index 0000000..02cf273
--- /dev/null
+++ b/colab/templates/header.html
@@ -0,0 +1,100 @@
+{% load i18n browserid conversejs gravatar proxy %}
+{% load static from staticfiles %}
+
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
+    </div>
+    <div class="collapse navbar-collapse navbar-main">
+      <ul class="nav navbar-nav">
+
+        <li>
+          <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
+        </li>
+
+        {% if feedzilla %}
+        <li>
+          <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
+        </li>
+        {% endif %}
+
+        {% proxy_menu %}
+
+        <li><a href="/paste">{% trans "Paste" %}</a></li>
+
+        <li class="hidden-lg hidden-md">
+          <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-nav navbar-right">
+        {% if not user.is_authenticated %}
+
+          <li class="dropdown hidden-xs hidden-lg">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              {% trans 'Login' as login_text %}
+              {% if BROWSERID_ENABLED %}
+                <li>{% browserid_login text=login_text %}</li>
+              {% else %}
+                <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+              {% endif %}
+            </ul>
+          </li>
+          {% trans 'Login' as login_text %}
+          {% if BROWSERID_ENABLED %}
+            <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
+          {% else %}
+            <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+            <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+          {% endif %}
+        {% else %}
+          <li id="user-menu" class="dropdown">
+            <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
+            <ul class="dropdown-menu" role="menu">
+              <li>
+                <div class="wrapper">
+                  <div class="thumbnail">{% gravatar user.email 100 %}</div>
+                  <div class="user-info">
+                    <span><b>{{ user.get_full_name }}</b></span>
+                    <span class="quiet">{{ user.email }}</span>
+                  </div>
+                  <div>
+                    <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
+                    {% trans 'Logout' as logout_text %}
+                    {% if BROWSERID_ENABLED %}
+                      {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
+                    {% else %}
+                      <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
+                    {% endif %}
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </li>
+        {% endif %}
+      </ul>
+
+      <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
+        <div class="form-group">
+          <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
+          <input name="q" id="header-searchbox"
+                  class="form-control" value="{{ request.GET.q }}"
+                  type="search" placeholder="{% trans 'Search here...' %}" />
+        </div>
+        <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+      </form>
+    </div>
+  </div>
+</nav>
+
--
libgit2 0.21.2