Merge lp:~jtv/maas/ipv6-ngi-layout into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Narrow down the cluster interfaces listing in the UI, so it doesn't get scrunched up as the columns fill up with longer values.

With IPv6 networks I started seeing layout problems. The “Manage DHCP and DNS” management indicator gets broken into two lines. It probably gets worse if you have a foreign DHCP server as well.

To fix that, I shortened the contents of the management column. Instead of saying “Status” at the top of the column (which wasn't right anyway) I made it say “Manage...” The entries then say just “DHCP” or “DHCP and DNS” where before they said “Manage DHCP” or “Manage DHCP and DNS.”

This may not be good UI design. But I wanted to try something and get some feedback at least, rather than be stuck with the problem.

Example of the old layout (not even at its worst; no foreign DHCP servers): http://people.canonical.com/~jtv/ngis-scrunched.png

Example of the new layout (with foreign DHCP servers): http://people.canonical.com/~jtv/ngis-narrower.png

Jeroen

[Raphaël Badin (rvb)]

Looks good, thanks for the screenshots.

Not sure I like the "..." at the end of the header though, it looks a bit odd. Maybe "Manage" would be enough.

review: Approve

[Jeroen T. Vermeulen (jtv)]

> Not sure I like the "..." at the end of the header though, it looks a bit odd.
> Maybe "Manage" would be enough.

Yeah, it's a tough one. Without it, it's not clear that you need to read it differently. Then you'd need something like "Management" — but not exactly that because it doesn't make sense. I just couldn't come up with a better term.

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2014-09-01 09:29:38 +0000
+++ src/maasserver/enum.py	2014-09-02 09:07:48 +0000
@@ -171,8 +171,8 @@
 # representation).
 NODEGROUPINTERFACE_MANAGEMENT_CHOICES = (
     (NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED, "Unmanaged"),
-    (NODEGROUPINTERFACE_MANAGEMENT.DHCP, "Manage DHCP"),
-    (NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS, "Manage DHCP and DNS"),
+    (NODEGROUPINTERFACE_MANAGEMENT.DHCP, "DHCP"),
+    (NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS, "DHCP and DNS"),
     )
 
 

=== modified file 'src/maasserver/templates/maasserver/nodegroup_edit.html'
--- src/maasserver/templates/maasserver/nodegroup_edit.html	2014-07-18 17:05:57 +0000
+++ src/maasserver/templates/maasserver/nodegroup_edit.html	2014-09-02 09:07:48 +0000
@@ -27,7 +27,7 @@
             <th>Name</th>
             <th>Interface</th>
             <th>Network</th>
-            <th>Status</th>
+            <th>Manage...</th>
             <th>Non-MAAS DHCP</th>
             <th></th>
           </tr>