From 3ca1ef9a0a8e6dbac2ffb41133c0bbc6adeea18d Mon Sep 17 00:00:00 2001
From: Steve Howell <steve@zulip.com>
Date: Fri, 11 Oct 2013 16:29:26 -0400
Subject: [PATCH] Use custom titles for the activity report.

(imported from commit ed991108715d043d5d21d8e9f7573eaedb21fec1)
---
 templates/zerver/activity.html |  5 +++++
 templates/zerver/base.html     | 12 +++++++-----
 zerver/views/__init__.py       |  4 +++-
 3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/templates/zerver/activity.html b/templates/zerver/activity.html
index 6f2ee4a241..96cfe0d62c 100644
--- a/templates/zerver/activity.html
+++ b/templates/zerver/activity.html
@@ -5,6 +5,11 @@
 
 {# User Activity. #}
 
+{% block title %}
+<title>{{ title }}</title>
+{% endblock %}
+
+
 {% block customhead %}
 {{ block.super }}
 {% minified_js 'activity' %}
diff --git a/templates/zerver/base.html b/templates/zerver/base.html
index 7bf0ec1850..5da1b8d54f 100644
--- a/templates/zerver/base.html
+++ b/templates/zerver/base.html
@@ -7,11 +7,13 @@
 
 <head>
     <meta charset="UTF-8">
-    {% if user_profile.realm.domain %}
-    <title>{{user_profile.realm.domain}} - Zulip</title>
-    {% else %}
-    <title>Zulip</title>
-    {% endif %}
+    {% block title %}
+        {% if user_profile.realm.domain %}
+        <title>{{user_profile.realm.domain}} - Zulip</title>
+        {% else %}
+        <title>Zulip</title>
+        {% endif %}
+    {% endblock %}
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
       <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index 0ef143374d..9a1efe6d01 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -2058,6 +2058,7 @@ def get_activity(request, realm=REQ(default=None)):
             ('Counts', counts_content),
             ('Durations', duration_content),
         ]
+        title = 'Activity'
     else:
         data = [
             ('Website',    ActivityTable(realm, 'website',       web_queries)),
@@ -2067,10 +2068,11 @@ def get_activity(request, realm=REQ(default=None)):
             ('Android',    ActivityTable(realm, 'Android',       api_queries)),
             ('iPhone',     ActivityTable(realm, 'iPhone',        api_queries))
         ]
+        title = '%s activity' % (realm,)
 
     return render_to_response(
         'zerver/activity.html',
-        dict(data=data, realm=realm),
+        dict(data=data, realm=realm, title=title),
         context_instance=RequestContext(request)
     )
 
