paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-23 16:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate the default_tab attribute in ActivityTable.

Browse Source 
(Just have the template automatically select the first tab.)

(imported from commit 4a1877c8d3d6215f8e8ad6a184c79bf4eb001001)
This commit is contained in:
Steve Howell
2013-09-25 18:15:12 -04:00
parent 9110ebd208
commit 0950aa45c4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zerver/activity.html
View File

@@ -22,7 +22,7 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
{% for name, activity in data %} {% for name, activity in data %}
<li {% if activity.default_tab %} class="active" {% endif %}> <li {% if forloop.first %} class="active" {% endif %}>
<a href="#{{ name }}" data-toggle="tab">{{ name }}</a> <a href="#{{ name }}" data-toggle="tab">{{ name }}</a>
</li> </li>
{% endfor %} {% endfor %}
@@ -32,7 +32,7 @@
{% for name, activity in data %} {% for name, activity in data %}
<div class="tab-pane {% if activity.default_tab %} active {% endif %}" id="{{ name }}"> <div class="tab-pane {% if forloop.first %} active {% endif %}" id="{{ name }}">
<h2>{{ name }} usage</h2> <h2>{{ name }} usage</h2>
<table class="table sortable table-striped table-bordered"> <table class="table sortable table-striped table-bordered">

5
zerver/views/__init__.py
View File

@@ -1752,9 +1752,8 @@ def json_fetch_api_key(request, user_profile, password=REQ):
return json_success({"api_key": user_profile.api_key}) return json_success({"api_key": user_profile.api_key})
class ActivityTable(object): class ActivityTable(object):
def __init__(self, realm, client_name, queries, default_tab=False): def __init__(self, realm, client_name, queries):
self.realm = realm self.realm = realm
self.default_tab = default_tab
self.has_pointer = False self.has_pointer = False
self.rows = {} self.rows = {}
@@ -1853,7 +1852,7 @@ def get_activity(request, realm=REQ(default=None)):
return render_to_response('zerver/activity.html', return render_to_response('zerver/activity.html',
{ 'data': [ { 'data': [
('Website', ActivityTable(realm, 'website', web_queries, default_tab=True)), ('Website', ActivityTable(realm, 'website', web_queries)),
('Mirror', ActivityTable(realm, 'zephyr_mirror', api_queries)), ('Mirror', ActivityTable(realm, 'zephyr_mirror', api_queries)),
('Desktop', ActivityTable(realm, 'desktop', api_queries)), ('Desktop', ActivityTable(realm, 'desktop', api_queries)),
('API', ActivityTable(realm, 'API', api_queries)), ('API', ActivityTable(realm, 'API', api_queries)),