← Back to branch summary

~lutostag/ubuntu/utopic/maas/1.5.2+packagefix

« back to all changes in this revision

Viewing changes to src/maasserver/templates/maasserver/zone_list.html

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez, Graham Binns, Andres Rodriguez, Julian Edwards, Seth Arnold
  • Date: 2014-02-15 12:08:23 UTC
  • mfrom: (1.2.22)
  • Revision ID: package-import@ubuntu.com-20140215120823-kew2lqrw5qgww721
Tags: 1.5+bzr1948-0ubuntu1
https://launchpad.net/bugs/1254034
* New upstream release.

[ Graham Binns ]
* debian/control: Depends on python-jsonschema.

[ Andres Rodriguez ]
* debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only
  readable by the app and not world readeable.
* debian/patches/02-pserv-config.patch: Refreshed.

[ Julian Edwards ]
* debian/extras/maas-cli renamed to debian/extras/maas, and introduce
  a deprecation warning in favour of using maas over maas-cli.
* debian/extras/maas renamed to debian/extras/maas-region-admin
* debian/maas-cli.install: install debian/extras/maas
* debian/maas-dns.postinst: Invoke maas-region-admin instead of maas
* debian/maas-region-controller-min.install: install maas-region-admin
  instead of maas
* debian/maas-region-controller.postinst: Invoke maas-region-admin instead
  of maas
* debian/maas-cli.links: Link from maas to maas-cli for backward compat.

[ Seth Arnold ]
* debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml
  gets correct permissions on upgrade (LP: #1254034)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/templates/maasserver/zone_list.html
32
32
            </td>
33
33
            <td>{{ zone_item.description|truncatechars:40 }}</td>
34
34
            <td>
35
 
              {{ zone_item.node_set.count }}
36
 
              (<a href="{% url 'node-list' %}?query=zone%3D{{ zone_item.name }}">view</a>)
 
35
              <a title="View nodes in zone {{ zone_item.name }}" 
 
36
                 href="{% url 'node-list' %}?query=zone%3D{{ zone_item.name }}">
 
37
                {{ zone_item.node_set.count }}
 
38
              </a>
37
39
            </td>
38
40
            {% if user.is_superuser %}
39
41
            <td>