Submitter:	Christian Hammond	Reviewers
Branch:	trunk	Groups:	reviewboard
Bugs:		People:
Change Number:	None	Repository:	Review Board SVN

Description:

This introduces the new Admin UI for Review Board. Major highlights include:

* A new look and feel.
* A new dashboard, showing the main models people generally need to work with (Users, review groups, default reviewers, repositories), some server information (Review Board version and cache stats), and Review Board news.
* The database models have been moved to a "Database" tab.

Once Extensions lands, there will be an Extensions tab for activating/deactivating/customizing extensions, alongside the "Dashboard" and "Database" tabs.

Further additions will be made in the future for easily changing server settings and possibly for allowing extensions to add dashboard elements.

Testing Done:

Made sure modifying the database fields still works fine.

Tested the news feed links, and made sure news loading failed gracefully if the server was inaccessible.

Screenshots:

Dashboard

Database Models

Cache Info

Diff revision 1 (Latest)

Files Changed:

/trunk/reviewboard/__init__.py: 1 change [ new content ]
/trunk/reviewboard/settings.py: 1 change [ 1 ]
/trunk/reviewboard/urls.py: 2 changes [ 1 2 ]
/trunk/reviewboard/admin/cache_stats.py: 1 change [ new content ]
/trunk/reviewboard/admin/urls.py: 1 change [ new content ]
/trunk/reviewboard/admin/views.py: 5 changes [ 1 2 3 4 5 ]
/trunk/reviewboard/htdocs/media/admin/css/dashboard.css: 0 changes [ ]
/trunk/reviewboard/htdocs/media/rb/css/admin.css: 1 change [ new content ]
/trunk/reviewboard/templates/base.html: 1 change [ 1 ]
/trunk/reviewboard/templates/admin/base_site.html: 3 changes [ 1 2 3 ]
/trunk/reviewboard/templates/admin/cache_stats.html: 1 change [ new content ]
/trunk/reviewboard/templates/admin/dashboard.html: 1 change [ new content ]
/trunk/reviewboard/templates/admin/database.html: 1 change [ new content ]
/trunk/reviewboard/templates/admin/feed.html: 1 change [ new content ]
/trunk/reviewboard/templates/admin/index.html: 1 change [ new content ]

Expand changes

/trunk/reviewboard/__init__.py
Revision 1384	New Change
	1	# The version of Review Board.
	2	VERSION = "0.4-pre"

     'django.contrib.contenttypes',
     'django.contrib.markup',
     'django.contrib.sites',
     'django.contrib.sessions',
     'djblets.datagrid',
     'djblets.feedview',
     'djblets.util',
     'djblets.webapi',
     'reviewboard.accounts',
     'reviewboard.admin',
     'reviewboard.diffviewer',

                                       AtomGroupReviewsFeed
 # URLs global to all modes
 urlpatterns = patterns('',
-    (r'^admin/', include('django.contrib.admin.urls')),
+    (r'^admin/', include('reviewboard.admin.urls')),
+)
 # Add static media if running in DEBUG mode
 if settings.DEBUG:
     urlpatterns += patterns('django.views.static',
+    }
     # Main includes
     urlpatterns += patterns('',
-        (r'^admin/', include('django.contrib.admin.urls')),
         (r'^api/json/', include('reviewboard.webapi.urls')),
         (r'^r/', include('reviewboard.reviews.urls')),
         (r'^reports/', include('reviewboard.reports.urls')),
+    )

 import datetime
 import re
 import socket
 try:
     import cmemcache as memcache
 except ImportError:
     try:
         import memcache
     except:
         memcache = None
 from django.conf import settings
 def get_memcached_hosts():
     """
     Returns the hosts currently configured for memcached.
     """
     if not memcache:
         return None
     m = re.match("memcached://([.\w]+:\d+;?)", settings.CACHE_BACKEND)
     if m:
         return m.group(1).split(";")
     return None
 def get_has_cache_stats():
     """
     Returns whether or not cache stats are supported.
     """
     return get_memcached_hosts() != None
 def get_cache_stats():
     """
     Returns a dictionary containing information on the current cache stats.
     This only supports memcache.
     """
     hostnames = get_memcached_hosts()
     if not hostnames:
         return None
     all_stats = []
     for hostname in hostnames:
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         host, port = hostname.split(":")
         try:
             s.connect((host, int(port)))
         except socket.error:
             s.close()
             continue
         s.send("stats\r\n")
         data = s.recv(1024)
         s.close()
         stats = {}
         for line in data.splitlines():
             info = line.split(" ")
             if info[0] == "STAT":
                 try:
                     value = int(info[2])
                 except ValueError:
                     value = info[2]
                 stats[info[1]] = value
         if stats['cmd_get'] == 0:
             stats['hit_rate'] = 0
             stats['miss_rate'] = 0
         else:
             stats['hit_rate'] = 100 * stats['get_hits'] / stats['cmd_get']
             stats['miss_rate'] = 100 * stats['get_misses'] / stats['cmd_get']
         all_stats.append((hostname, stats))
     return all_stats

 from django.conf.urls.defaults import *
 NEWS_FEED = "http://www.review-board.org/news/feed/"
 urlpatterns = patterns('reviewboard.admin.views',
     ('^$', 'dashboard'),
     ('^cache/$', 'cache_stats'),
+)
 urlpatterns += patterns('',
     ('^db/', include('django.contrib.admin.urls')),
     ('^feed/news/$', 'djblets.feedview.views.view_feed',
      {'template_name': 'admin/feed.html',
       'url': NEWS_FEED}),
     ('^feed/news/rss/$', 'django.views.generic.simple.redirect_to',
      {'url': NEWS_FEED}),
+)

 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.http import Http404, HttpResponse
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext as _
 from reviewboard import VERSION
 from reviewboard.admin.checks import check_updates_required
 from reviewboard.admin.cache_stats import get_cache_stats, get_has_cache_stats
 from reviewboard.reviews.models import Group, DefaultReviewer
 from reviewboard.scmtools.models import Repository
 @staff_member_required
 def dashboard(request, template_name="admin/dashboard.html"):
     """
     Displays the administration dashboard, containing news updates and
     useful administration tasks.
     """
     return render_to_response(template_name, RequestContext(request, {
         'user_count': User.objects.count(),
         'reviewgroup_count': Group.objects.count(),
         'defaultreviewer_count': DefaultReviewer.objects.count(),
         'repository_count': Repository.objects.count(),
         'has_cache_stats': get_has_cache_stats(),
         'title': _("Dashboard"),
         'version': VERSION,
     }))
 @staff_member_required
 def cache_stats(request, template_name="admin/cache_stats.html"):
     """
     Displays statistics on the cache. This includes such pieces of
     information as memory used, cache misses, and uptime.
     """
     # Make sure we're using memcache
     cache_stats = get_cache_stats()
     return render_to_response(template_name, RequestContext(request, {
         'cache_hosts': cache_stats,
         'cache_backend': cache.__module__,
         'title': _("Server Cache"),
     }))
 def manual_updates_required(request,
                             template_name="admin/manual_updates_required.html"):
     """
     Checks for required manual updates and displays informational pages on
     performing the necessary updates.
     """
     updates = check_updates_required()
     return render_to_response(template_name, RequestContext(request, {
         'updates': [render_to_string(template_name,
                                      RequestContext(request, extra_context))
                     for (template_name, extra_context) in updates],
     }))

 @import url('base.css');
 /* DASHBOARD */
 .dashboard .module table th { width:100%; }
 .dashboard .module table td { white-space:nowrap; }
 .dashboard .module table td a { display:block; padding-right:.6em; }
 /*  RECENT ACTIONS MODULE  */
 .module ul.actionlist { margin-left:0; }
 ul.actionlist li { list-style-type:none; }

 #admin-nav {
   background-color: #557ab1;
   float: left;
   list-style: none;
   margin: 0;
   padding: 0 10px;
   width: 100%;
+}
 #admin-nav li {
   display: block;
   float: left;
   line-height: normal;
   margin: 0 10px 0 0;
   padding: 0;
+}
 #admin-nav li a {
   display: block;
   float: left;
   font-size: 110%;
   padding: 4px 8px;
+}
 #admin-nav li a:hover {
   background-color: #2f5183;
   text-decoration: none;
+}
 #admin-nav li a.active {
   background-color: #173663;
+}
 .module.manage .count {
   color: #A0A0A0;
   font-size: x-small;
   font-weight: normal;
+}
 .module.news {
   margin-top: 10px;
   width: 100%;
+}
 .module caption a {
   color: white;
+}
 .module caption img {
   vertical-align: bottom;
+}
 .module caption span.actions {
   float: right;
+}
 .module caption span.title {
   float: left;
+}
 .module caption {
   width: 100%;
+}
 /***************************************************************************
  * Django Admin overrides
  ***************************************************************************/
 table thead th.ascending a {
   background: transparent url("../../djblets/images/datagrid/sort_asc_primary.png") no-repeat right 0.4em;
+}
 thead th, tfoot td {
   background: transparent url("../../djblets/images/datagrid/header_bg.png") repeat-x;
   padding: 5px;
   border-bottom: 1px solid #999999;
   border-right: 1px solid #CCCCCC;
   border-top: 1px solid #999999;
   border-left: 0 !important;
+}
 thead th a:link, thead th a:visited {
   color: black;
+}
 #branding h1 {
   color: #EEEEEE;
+}
 #content-related .module h2 {
   background: #5988bb;
   color: white;
+}
 #header {
   background-color: #2f5183;
+}
 .dashboard #content {
   width: auto;
+}
 .module h2, .module caption {
   background: #5988bb;
+}
 .module {
   border-color: #C0C0C0;
+}
 .row1 {
   background: #F2F2F2;
+}
 td, th {
   border-bottom: 0;
+}
 /* Override the way links and wrapping work in modules. */
 .module.news table td {
   white-space: normal;
   padding: 0;
+}
 .module.news table td a {
   display: inline;
   padding: 0;
+}
 .module.news .entry {
   padding-bottom: 0.8em;
+}
 .module.news .entry-title {
   padding-top: 0.4em;
   padding-bottom: 0.8em;
+}
 .module.news .entry-content {
   margin-left: 1.2em;
+}
 .module.news .loading-indicator {
   padding: 4px;
+}
 .module.news .feed-error {
   margin: 0;
   padding: 4px;
+}

     <ul id="accountnav">
     {% if user.is_authenticated %}
      {% blocktrans with user|realname|escape as username %}<li>Welcome, <b>{{username}}</b></li>{% endblocktrans %}
      <li>- <a href="{% url user-preferences %}">{% trans "My account" %}</a></li>
 {% if user.is_staff %}
-     <li>- <a href="{% url django.contrib.admin.views.main.index %}">{% trans "Admin" %}</a></li>
+     <li>- <a href="{% url reviewboard.admin.views.dashboard %}">{% trans "Admin" %}</a></li>
 {% endif %}
      <li>- <a href="{% url logout %}">{% trans "Log out" %}</a></li>
     {% else %}
      <li><a href="{% url login %}?next_page={{request.path}}">{% trans "Log in" %}</a></li>
      {% if settings.BUILTIN_AUTH %}

 {% extends "admin/base.html" %}
 {% load i18n %}
 {% block title %}{{title}} | {% trans "Review Board administration" %}{% endblock %}
 {% block extrastyle %}
 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}rb/css/admin.css" />
 <link rel="icon" type="image/png" href="{{MEDIA_URL}}rb/images/favicon.png" />
 {% endblock %}
 {% block branding %}
 <h1 id="site-name">{% trans "Review Board administration" %}</h1>
 {% endblock %}
-{% block nav-global %}{% endblock %}
+{% block breadcrumbs %}
 <div class="breadcrumbs"><a href="{{SITE_ROOT}}admin/">{% trans "Home" %}</a> {% if title %} &rsaquo; {{ title|escape }}{% endif %}</div>
 {% endblock %}
 {% block nav-global %}
 {%  if user.is_authenticated %}
 <ul id="admin-nav">
  <li><a href="{% url reviewboard.admin.views.dashboard %}">Dashboard</a></li>
  <li><a href="{% url django.contrib.admin.views.main.index %}">Database</a></li>
 </ul>
 {%  endif %}
 {% endblock %}

 {% extends "admin/base_site.html" %}
 {% load i18n %}
 {% block content %}
 <b>Cache backend:</b> {{cache_backend}}
 <h2>Statistics</h2>
 {% if cache_hosts %}
 {%  for hostname,stats in cache_hosts %}
 <div class="module">
  <table>
   <caption>{{hostname}}</caption>
   <tr>
    <th scope="row">{% trans "Memory usage:" %}</th>
    <td>{{stats.bytes|filesizeformat}}</td>
   </tr>
   <tr>
    <th scope="row">{% trans "Keys in cache:" %}</th>
    <td>{{stats.curr_items}} of {{stats.total_items}}</td>
   </tr>
   <tr>
    <th scope="row">{% trans "Cache hits:" %}</th>
    <td>{{stats.get_hits}} of {{stats.cmd_get}}: {{stats.hit_rate}}%</td>
   </tr>
   <tr>
    <th scope="row">{% trans "Cache misses:" %}</th>
    <td>{{stats.get_misses}} of {{stats.cmd_get}}: {{stats.miss_rate}}%</td>
   </tr>
   <tr>
    <th scope="row">{% trans "Cache evictions:" %}</th>
    <td>{{stats.evictions}}</td>
   </tr>
   <tr>
    <th scope="row">{% trans "Cache traffic:" %}</th>
    <td>{{stats.bytes_read|filesizeformat}} in,
        {{stats.bytes_written|filesizeformat}} out</td>
   </tr>
   <tr>
    <th scope="row">{% trans "Uptime:" %}</th>
    <td>{{stats.uptime}}</td>
   </tr>
  </table>
 </div>
 {%  endfor %}
 {% else %}
 <p>{% trans "Statistics are not available for this backend." %}</p>
 {% endif %}
 {% endblock %}

 {% extends "admin/base_site.html" %}
 {% load adminmedia %}
 {% load adminapplist %}
 {% load i18n %}
 {% load log %}
 {% block stylesheet %}{% admin_media_prefix %}css/dashboard.css{% endblock %}
 {% block coltype %}colM{% endblock %}
 {% block bodyclass %}dashboard{% endblock %}
 {% block breadcrumbs %}{% endblock %}
 {% block extrahead %}
 <script type="text/javascript" src="{{MEDIA_URL}}yui/yahoo/yahoo-min.js"></script>
 <script type="text/javascript" src="{{MEDIA_URL}}yui/connection/connection-min.js"></script>
 <script type="text/javascript" src="{{MEDIA_URL}}yui/dom/dom-min.js"></script>
 <script type="text/javascript" src="{{MEDIA_URL}}yui/event/event-min.js"></script>
 <script type="text/javascript" src="{{MEDIA_URL}}yui-ext/yui-ext.js"></script>
 {% endblock %}
 {% block content %}
 <div class="colMS">
  <div id="content-main">
   {# "Manage" section #}
   <div class="module manage">
    <table summary="{% trans "Common management operations." %}">
     <caption>{% trans "Manage" %}</caption>
     <tbody>
      <tr>
       <th scope="row"><a href="db/auth/user/">{% trans "Users" %}</a>
         <span class="count">({{user_count}})</span></th>
       <td><a class="addlink" href="db/auth/user/add/">{% trans "Add" %}</a></td>
      </tr>
      <tr>
       <th scope="row"><a href="db/reviews/group/">{% trans "Review groups" %}</a>
         <span class="count">({{reviewgroup_count}})</span></th>
       <td><a class="addlink" href="db/reviews/group/add/">{% trans "Add" %}</a></td>
      </tr>
      <tr>
       <th scope="row"><a href="db/reviews/defaultreviewer/">{% trans "Default reviewers" %}</a>
         <span class="count">({{defaultreviewer_count}})</span></th>
       <td><a class="addlink" href="db/reviews/defaultreviewer/add/">{% trans "Add" %}

Review Board

beta

This change has been marked as submitted.

Add the new Admin UI

Diff revision 1 (Latest)