allura
Revision | 3b1a74a7d05c96abf414690ea1b52a03cb8b21fc (tree) |
---|---|
Zeit | 2012-04-19 02:57:38 |
Autor | Jenny Steele <jsteele@geek...> |
Commiter | Jenny Steele |
[#3949] UI cleanup for neighborhood stats
@@ -1,7 +1,5 @@ | ||
1 | 1 | {% extends g.theme.master %} |
2 | 2 | |
3 | -{% do g.register_forge_css('css/forge/deck.css') %} | |
4 | - | |
5 | 3 | {% block top_nav %} |
6 | 4 | {% include 'allura:templates/jinja_master/neigh_top_nav.html' %} |
7 | 5 | {% endblock %} |
@@ -11,37 +9,25 @@ | ||
11 | 9 | {% block header %}Neighborhood Statistics{% endblock %} |
12 | 10 | |
13 | 11 | {% block content %} |
14 | - <div class="nested-grid-container"> | |
15 | - <span class="grid-prefix-1 grid-9 installable_tool"> | |
16 | - <b>Projects</b> | |
17 | - </span> | |
18 | - <span class="grid-9 installable_tool"> | |
19 | - <b>Last updated</b> | |
20 | - </span> | |
21 | - <span class="grid-prefix-1 grid-9 installable_tool"> | |
22 | - {% if h.asbool(config.get('allow_project_delete', True)) %} | |
23 | - Deleted: {{ delete_count }} | |
24 | - {% endif %} | |
25 | - </span> | |
26 | - <span class="grid-9 installable_tool"> | |
27 | - Last 30 days: {{ last_updated_30 }} | |
28 | - </span> | |
29 | - <span class="grid-prefix-1 grid-9 installable_tool"> | |
30 | - Public: {{ public_count }} | |
31 | - </span> | |
32 | - <span class="grid-9 installable_tool"> | |
33 | - Last 60 days: {{ last_updated_60 }} | |
34 | - </span> | |
35 | - <span class="grid-prefix-1 grid-9 installable_tool"> | |
36 | - Private: {{ private_count }} | |
37 | - </span> | |
38 | - <span class="grid-9 installable_tool"> | |
39 | - Last 90 days: {{ last_updated_90 }} | |
40 | - </span> | |
41 | - <br style="clear:both"/> | |
42 | - <span class="grid-prefix-1 grid-9 installable_tool"> | |
43 | - <a href="adminlist">Admins list</a> | |
44 | - </span> | |
12 | + <div class="grid-9"> | |
13 | + <b>Number of projects that are...</b> | |
14 | + <ul> | |
15 | + <li>Public: {{ public_count }}</li> | |
16 | + <li>Private: {{ private_count }}</li> | |
17 | + {% if h.asbool(config.get('allow_project_delete', True)) %} | |
18 | + <li>Deleted: {{ delete_count }}</li> | |
19 | + {% endif %} | |
20 | + </ul> | |
21 | + </div> | |
22 | + <div class="grid-10"> | |
23 | + <b>Number of projects updated in the last...</b> | |
24 | + <ul> | |
25 | + <li>30 days: {{ last_updated_30 }}</li> | |
26 | + <li>60 days: {{ last_updated_60 }}</li> | |
27 | + <li>90 days: {{ last_updated_90 }}</li> | |
28 | + </ul> | |
29 | + </div> | |
30 | + <div class="grid-19"> | |
31 | + <a href="adminlist">View a list of project admins</a> | |
45 | 32 | </div> |
46 | - | |
47 | 33 | {% endblock %} |
@@ -1,7 +1,5 @@ | ||
1 | 1 | {% extends g.theme.master %} |
2 | 2 | |
3 | -{% do g.register_forge_css('css/forge/deck.css') %} | |
4 | - | |
5 | 3 | {% block title %}{{c.project.name}} / Statistics / Admins list{% endblock %} |
6 | 4 | |
7 | 5 | {% block header %}Admins list{% endblock %} |
@@ -11,30 +9,26 @@ | ||
11 | 9 | {% endblock %} |
12 | 10 | |
13 | 11 | {% block content %} |
14 | -<div class="nested-grid-container"> | |
15 | - <div style="overflow:auto"> | |
16 | - <table> | |
17 | - <thead> | |
18 | - <tr> | |
19 | - <th>Project</th> | |
20 | - <th>Username</th> | |
21 | - <th>E-mail</th> | |
22 | - <th>Name</th> | |
23 | - </tr> | |
24 | - </thead> | |
25 | - <tbody> | |
26 | - {% for entry in entries %} | |
27 | - <tr> | |
28 | - <td style="white-space: nowrap"><a href="{{entry.project.url()}}">{{ entry.project.name }}</a></td> | |
29 | - <td>{{ entry.user.username }}</td> | |
30 | - <td>{{ entry.user.preferences.email_address or 'Unknown' }}</td> | |
31 | - <td>{{ entry.user.display_name }}</td> | |
32 | - </tr> | |
33 | - {% endfor %} | |
34 | - </tbody> | |
35 | - </table> | |
36 | - </div> | |
37 | -</div> | |
12 | +<table> | |
13 | + <thead> | |
14 | + <tr> | |
15 | + <th>Project</th> | |
16 | + <th>Username</th> | |
17 | + <th>E-mail</th> | |
18 | + <th>Name</th> | |
19 | + </tr> | |
20 | + </thead> | |
21 | + <tbody> | |
22 | + {% for entry in entries %} | |
23 | + <tr> | |
24 | + <td style="white-space: nowrap"><a href="{{entry.project.url()}}">{{ entry.project.name }}</a></td> | |
25 | + <td>{{ entry.user.username }}</td> | |
26 | + <td>{{ entry.user.preferences.email_address or 'Unknown' }}</td> | |
27 | + <td>{{ entry.user.display_name }}</td> | |
28 | + </tr> | |
29 | + {% endfor %} | |
30 | + </tbody> | |
31 | +</table> | |
38 | 32 | |
39 | 33 | <div class="grid-15" style="clear:both"> |
40 | 34 | {{page_list.display(limit=limit, page=page, count=count)}} |