Commit: 3b1a74a7d05c96abf414690ea1b52a03cb8b21fc - allura (git)

allura

Commit MetaInfo

• Revision: 3b1a74a7d05c96abf414690ea1b52a03cb8b21fc (tree)
• Time: 2012-04-19 02:57:38
• Author: Jenny Steele <jsteele@geek...>
• Commiter: Jenny Steele

Log Message

[#3949] UI cleanup for neighborhood stats

Change Summary

• modified: Allura/allura/templates/neighborhood_stats.html
• modified: Allura/allura/templates/neighborhood_stats_adminlist.html

Incremental Difference

--- a/Allura/allura/templates/neighborhood_stats.html
+++ b/Allura/allura/templates/neighborhood_stats.html
@@ -1,7 +1,5 @@
 {% extends g.theme.master %}
 
-{% do g.register_forge_css('css/forge/deck.css') %}
-
 {% block top_nav %}
     {% include 'allura:templates/jinja_master/neigh_top_nav.html' %}
 {% endblock %}
@@ -11,37 +9,25 @@
 {% block header %}Neighborhood Statistics{% endblock %}
 
 {% block content %}
-  <div class="nested-grid-container">
-    <span class="grid-prefix-1 grid-9 installable_tool">
-      <b>Projects</b>
-    </span>
-    <span class="grid-9 installable_tool">
-      <b>Last updated</b>
-    </span>
-    <span class="grid-prefix-1 grid-9 installable_tool">
-    {% if h.asbool(config.get('allow_project_delete', True)) %}
-      Deleted: {{ delete_count }}
-    {% endif %}
-    </span>
-    <span class="grid-9 installable_tool">
-      Last 30 days: {{ last_updated_30 }}
-    </span>
-    <span class="grid-prefix-1 grid-9 installable_tool">
-      Public: {{ public_count }}
-    </span>
-    <span class="grid-9 installable_tool">
-      Last 60 days: {{ last_updated_60 }}
-    </span>
-    <span class="grid-prefix-1 grid-9 installable_tool">
-      Private: {{ private_count }}
-    </span>
-    <span class="grid-9 installable_tool">
-      Last 90 days: {{ last_updated_90 }}
-    </span>
-    <br style="clear:both"/>
-    <span class="grid-prefix-1 grid-9 installable_tool">
-      <a href="adminlist">Admins list</a>
-    </span>
+  <div class="grid-9">
+    <b>Number of projects that are...</b>
+    <ul>
+      <li>Public: {{ public_count }}</li>
+      <li>Private: {{ private_count }}</li>
+      {% if h.asbool(config.get('allow_project_delete', True)) %}
+      <li>Deleted: {{ delete_count }}</li>
+      {% endif %}
+    </ul>
+  </div>
+  <div class="grid-10">
+    <b>Number of projects updated in the last...</b>
+    <ul>
+    <li>30 days: {{ last_updated_30 }}</li>
+    <li>60 days: {{ last_updated_60 }}</li>
+    <li>90 days: {{ last_updated_90 }}</li>
+    </ul>
+  </div>
+  <div class="grid-19">
+    <a href="adminlist">View a list of project admins</a>
   </div>
-
 {% endblock %}

--- a/Allura/allura/templates/neighborhood_stats_adminlist.html
+++ b/Allura/allura/templates/neighborhood_stats_adminlist.html
@@ -1,7 +1,5 @@
 {% extends g.theme.master %}
 
-{% do g.register_forge_css('css/forge/deck.css') %}
-
 {% block title %}{{c.project.name}} / Statistics / Admins list{% endblock %}
 
 {% block header %}Admins list{% endblock %}
@@ -11,30 +9,26 @@
 {% endblock %}
 
 {% block content %}
-<div class="nested-grid-container">
-  <div style="overflow:auto">
-    <table>
-      <thead>
-        <tr>
-          <th>Project</th>
-          <th>Username</th>
-          <th>E-mail</th>
-          <th>Name</th>
-        </tr>
-      </thead>
-      <tbody>
-        {% for entry in entries %}
-        <tr>
-          <td style="white-space: nowrap"><a href="{{entry.project.url()}}">{{ entry.project.name }}</a></td>
-          <td>{{ entry.user.username }}</td>
-          <td>{{ entry.user.preferences.email_address or 'Unknown' }}</td>
-          <td>{{ entry.user.display_name }}</td>
-        </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-  </div>
-</div>
+<table>
+  <thead>
+    <tr>
+      <th>Project</th>
+      <th>Username</th>
+      <th>E-mail</th>
+      <th>Name</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for entry in entries %}
+    <tr>
+      <td style="white-space: nowrap"><a href="{{entry.project.url()}}">{{ entry.project.name }}</a></td>
+      <td>{{ entry.user.username }}</td>
+      <td>{{ entry.user.preferences.email_address or 'Unknown' }}</td>
+      <td>{{ entry.user.display_name }}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
 
 <div class="grid-15" style="clear:both">
   {{page_list.display(limit=limit, page=page, count=count)}}