Merge pull request #153 from colab/title_refactor

Added possibility to override full title
colab · Jan 25, 2016 · 64a1720 · 64a1720
2 parents 0f5bb53 + 945d6c6
commit 64a1720
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/colab/accounts/templates/accounts/user_detail.html b/colab/accounts/templates/accounts/user_detail.html
@@ -10,7 +10,7 @@
    {{ block.super }}
 {% endblock %}
 
-{% block title %}Perfil{% endblock %}
+{% block pagetitle %}Perfil{% endblock %}
 
 {% block head_js %}
   {% for widget in widgets_charts %}

diff --git a/colab/accounts/templates/registration/password_reset_complete_custom.html b/colab/accounts/templates/registration/password_reset_complete_custom.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Password reset complete{% endblock %}
+{% block pagetitle %}Password reset complete{% endblock %}
 
 {% block main-content %}
 <p>Your password has been set.  You may go ahead and log in now.</p>

diff --git a/colab/accounts/templates/registration/password_reset_confirm_custom.html b/colab/accounts/templates/registration/password_reset_confirm_custom.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Setting New password" %}{% endblock %}
+{% block pagetitle %}{% trans "Setting New password" %}{% endblock %}
 {% block main-content %}
   {% if validlink %}
 

diff --git a/colab/accounts/templates/registration/password_reset_done_custom.html b/colab/accounts/templates/registration/password_reset_done_custom.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Password reset successful{% endblock %}
+{% block pagetitle %}Password reset successful{% endblock %}
 
 {% block main-content %}
 <p>We've e-mailed you instructions for setting your password to the e-mail address you submitted.</p>

diff --git a/colab/search/templates/search/search.html b/colab/search/templates/search/search.html
@@ -2,7 +2,7 @@
 {% load i18n tz highlight superarchives search_preview_templates %}
 {% load static from staticfiles %}
 
-{% block title %}{% trans 'search'|title %}{% endblock %}
+{% block pagetitle %}{% trans 'search'|title %}{% endblock %}
 
 {% block head_js %}
 <script type="text/javascript" src="{% static 'third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js' %}"></script>

diff --git a/colab/super_archives/templates/message-thread.html b/colab/super_archives/templates/message-thread.html
@@ -3,7 +3,7 @@
 
 {% trans "Anonymous" as anonymous %}
 
-{% block title %}{{ first_msg.subject_clean }}{% endblock %}
+{% block pagetitle %}{{ first_msg.subject_clean }}{% endblock %}
 
 {% block head_js %}
 

diff --git a/colab/templates/base.html b/colab/templates/base.html
@@ -14,7 +14,7 @@
       {% endif %}
     {% endblock %}
 
-    <title>{% block title %}Colab{% endblock %} - Colab</title>
+    <title>{%block title %}{% block pagetitle %}Colab{% endblock %} - Colab {% endblock %}</title>
 
     <link rel="shortcut icon" type="image/x-icon" href="{% static 'img/fav.ico' %}">
 

diff --git a/colab/templates/home.html b/colab/templates/home.html
@@ -6,7 +6,7 @@
   {{block.super}}
 {% endblock %}
 
-{% block title %}Home{% endblock %}
+{% block pagetitle %}Home{% endblock %}
 
 {% block head_js %}
   {% for widget in  widgets_dashboard %}