Merge lp:~ltrager/maas/lp1685361_2.1 into lp:~maas-committers/maas/trunk

[Lee Trager]

Fix 00-maas-07-block-devices to run on Trusty.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2017-03-10 16:34:33 +0000
+++ MANIFEST.in	2017-04-25 09:34:40 +0000
@@ -1,8 +1,19 @@
+<<<<<<< TREE
 graft src/maasserver/static
 graft src/maasserver/templates
 graft src/metadataserver/fixtures
 graft src/metadataserver/user_data/templates
 graft src/provisioningserver/templates
+=======
+graft src/maasserver/static
+graft src/maasserver/templates
+graft src/metadataserver/fixtures
+graft src/provisioningserver/templates
+>>>>>>> MERGE-SOURCE
 include src/maasserver/migrations/south/django16_south_maas19.tar.gz
+<<<<<<< TREE
 include src/provisioningserver/drivers/power/*.xml
 include src/metadataserver/builtin_scripts/*.sh
+=======
+include src/provisioningserver/drivers/power/*.xml
+>>>>>>> MERGE-SOURCE

=== modified file 'contrib/preseeds_v2/curtin_userdata'
=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2017-02-17 14:23:04 +0000
+++ docs/changelog.rst	2017-04-25 09:34:40 +0000
@@ -2,8 +2,207 @@
 Changelog
 =========
 
+<<<<<<< TREE
 2.2.0 (beta1)
 =============
+=======
+2.1.6
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1677507    Fix potential IP allocation from incorrect range.
+
+LP: #1674807    Fix missing default_gateways entry in machine API output.
+
+
+2.1.5
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1671891    Fix deployment with AUTO IPs set as the gateway link.
+
+LP: #1671048    Fix crash when getting the default gateways for a machine.
+
+LP: #1673916    Fix regression that causes traceback in rack-based mDNS monitoring service.
+
+LP: #1673724    Due to a potential regression in lsblk, try to ensure list of block devices is ordered correctly.
+
+
+2.1.4
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1655049    Prevent IndexError in get_vendor_for_mac()
+
+LP: #1654432    Unable to deploy ga kernel on node-details page
+
+LP: #1654450    MAAS shouldn't show newer kernels when edge kernels are added
+
+LP: #1654412	Unable to set edge kernel as the min_hwe_kernel and deploy with the default kernel
+
+LP: #1656425    Ephemeral environments using the wrong kernel
+
+LP: #1655721    MAAS shouldn't update TGT config when there are no boot sources
+
+LP: #1659511    Fix incorrect clearing of boot resource cache if an IOError occurs.
+
+LP: #1659607    Usability fixes for interfaces API link-subnet operation
+
+LP: #1640147    Do not attempt IPv6 discovery on interfaces where IPv6 is disabled
+
+LP: #1626654    Make connection attempts from rack to region controllers more reliable
+
+LP: #1626654    Fix reports of bad connections when dead regiond workers remain in the database
+
+LP: #1645912    Fix IPMI autodetection to wrap IPv6 addresses in brackers when used inside URLs
+
+LP: #1665459    Fix anonymous auto-enlistment to properly detect rack-facing region IP address
+
+LP: #1665143    Select the shortest by-id path when discovering block devices to address issues when discovering nvme devices.
+
+
+Other notable changes
+---------------------
+
+It is now possible to prevent deploying machines from rebooting.
+
+
+2.1.3
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1611999    [2.1] MAAS cannot power query with Cisco UCSM power driver.
+
+LP: #1604962    node set to "failed deployment" for no visible reason
+
+LP: #1614584    MAAS fails to start when gethostname returns an FQDN.
+
+LP: #1582323    Select MAAS datasource specifically to ensure commissioning doesn't fail when competing cloud metadata resides on disk
+
+LP: #1646163    [2.1] Icon need to be improved
+
+LP: #1646162    [2.1] Sticky header has been removed
+
+LP: #1646160    [2.1] Device discovery UI does not have a loading state
+
+LP: #1628126    [2.1, FUJ] Column layout shouldn't resize until screen is smaller than 1440
+
+LP: #1628058    [2.1, FUJ] The form spacing is not compatible to the designs
+
+LP: #1628054    [2.1, FUJ] Section complete/incomplete icon
+
+LP: #1639182    [2.1] log format differs for Yakkety
+
+LP: #1637401    Re-adding virsh chassis to discover new nodes powers down existing nodes
+
+LP: #1642033    IPs with multiple names can corrupt DNS zone data
+
+LP: #1646955    'main_archive_hostname' is not defined
+
+LP: #1651452    Use correct escaping for EFI's kernel command line datasource_list.
+
+
+2.1.2
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1516065    Fix IPMI chassis config session timeout issue when configuring the boot device.  Only error on PowerAuthErrors when configuring the IPMI chassis boot order.
+
+LP: #1642996    2.x preseeds with {{escape.shell}} fail if not upgraded at 2.1.1
+
+LP: #1643057    juju2 with maas 2.1.1 LXD containers get wrong ip addresses
+
+LP: #1640300    Be defensive in the postgresql listener when a system notification is received for a none existent handler or missing listener channel.
+
+LP: #1613862    Re-allow configuration of the port where to connect to postgresql.
+
+LP: #1638575    Add two capabilities: bridging-interface-ubuntu and bridging-automatic-ubuntu.
+
+
+2.1.1
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1554636    maas serving old image to nodes
+
+LP: #1593991    [2.0b7, API/CLI] allows you to add machines with power_type and no power_parameters
+
+LP: #1602482    [2.0rc2] Incorrect DNS records
+
+LP: #1620478    [2.1, UI] Broken validation on VLAN MTU
+
+LP: #1630636    [2.1 ipv6] YAML error when maas_url has an IPv6 IP
+
+LP: #1630679    [2.1b1] Can't use custom image repository
+
+LP: #1633717    [2.1] DHCP probe needs to be smarter about interface selection to avoid log spam
+
+LP: #1636858    [2.1.1, trunk, bzr5510] Can't enlist machines
+
+LP: #1636861    [2.1.1, trunk, bzr5510] UI error when adding a chassis
+
+LP: #1636992    [2.1] Deleting all boot sources and creating a new boot source, does not update the cache
+
+LP: #1598175    [2.0] If the machine is deployed, I cannot update NIC's nor storage
+
+LP: #1603563    [2.0 RC2] Multiple failures to release nodes
+
+LP: #1606508    [2.1] Failover peers must be IPv4 for use with ISC dhcpd
+
+LP: #1632853    [2.1] Observed neighbours should be avoided when assigning IP addresses
+
+LP: #1633401    [2.1] In device discovery in Settings, remove the header of the first dropdown field (Host discovery and network observation)
+
+LP: #1633452    [2.1] In settings, rename the option Disabled (suppress active scanning) in the Active discovery interval field to Never (disabled).
+
+LP: #1633462    [2.1] In settings in the device discovery section reduce the text of the explanation of the fields.
+
+LP: #1633822    [2.1] Device discovery ignores reverse DNS
+
+LP: #1636250    [2.1] machines allocate API returns a random machine if incorrect - parameters are used
+
+LP: #1636873    [2.1.0] Creating a bond doesn't work and no feedback is provided if fabric in interfaces is 'disconnected'
+
+LP: #1636874    [2.1, Yakkety] Plus '+' button is not visible when you hover over an interface in machine details
+
+LP: #1637009    [2.0,2.1] Node acquisition constraints API documentation needs to be updated to match reality
+
+LP: #1637182    Help and documentation 'list of unicodes' inconsistent
+
+LP: #1637192    [2.0,2.1] Allocate using subnets or not_subnets with space fails
+
+LP: #1637246    MaaS should use configured names for VLAN interfaces
+
+LP: #1638284    [2.1.1pre] Debug logging shown by default in regiond.conf
+
+LP: #1638288    [2.1.1 pre] A lot of repeated logging
+
+LP: #1638589    [2.1] commissioning doesn't find the second address family on the boot interface
+
+LP: #1600328    [2.0rc1, API/CLI] When adding a new machine and no rack controller can connect to the BMC, no error message is displayed.
+
+LP: #1633378    [Device Discovery] Rename the section Header in the Settings page
+
+LP: #1633600    [2.1.1] Docs do not mention the need to mirror bootloaders
+
+LP: #1636251    resolv.conf search path doesn't match the domain for the host
+
+
+2.1.0
+=====
+>>>>>>> MERGE-SOURCE
 
 Important announcements
 -----------------------

=== added file 'docs/troubleshooting.rst.OTHER'
--- docs/troubleshooting.rst.OTHER	1970-01-01 00:00:00 +0000
+++ docs/troubleshooting.rst.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,200 @@
+********************
+MAAS Troubleshooting
+********************
+
+Some parts of MAAS may still be a little confusing, and sometimes you might be
+trying to do things that are just plain impossible. This section covers some of
+the most commonly encountered problems and tries its best to make them gone.
+
+.. contents:: Contents
+ :depth: 1
+ :local:
+
+
+Nodes hang on "Commissioning"
+=============================
+
+
+Possible Cause: Timing issues
+-----------------------------
+
+Various parts of MAAS rely on OAuth to negotiate a connection to nodes. If the
+current time reported by the hardware clock on your node differs significantly
+from that on the MAAS server, the connection will not be made.
+
+**SOLUTION:** Check that the hardware clocks are consistent, and if necessary,
+adjust them. This can usually be done from within the system BIOS, without
+needing to install an OS
+
+
+Possible Cause: Network drivers
+-------------------------------
+
+Sometimes the hardware can boot from PXE, but fail to load correct drivers when
+booting the received image. This is sometimes the case when no open source
+drivers are available for the network hardware.
+
+**SOLUTION:** The best fix for this problem is to install a Linux-friendly
+network adapter. It *is* theoretically possible to modify the boot image to
+include proprietary drivers, but it is not a straightforward task.
+
+
+Nodes fail to PXE boot
+======================
+
+
+Possible Cause: Using an incorrectly configured VM
+--------------------------------------------------
+
+Some Virtual Machine setups include emulation of network hardware that does not
+support PXE booting, and in most setups, you will need to explicitly set up the
+VM to boot via PXE.
+
+**SOLUTION**: Consult the VM docs for details of PXE booting.
+
+
+Possible Cause: DHCP conflict
+-----------------------------
+
+If you are using MAAS in a setup with an existing DHCP, *DO NOT SET UP THE MAAS
+DHCP SERVER* as this will cause no end of confusion to the rest of your network
+and most likely won't discover any nodes either.
+
+**SOLUTION**: You will need to configure your existing DHCP server to
+point to the MAAS server.
+
+
+Can't log in to node
+====================
+
+Sometimes you may wish to login directly to a node on your system. If
+you have set up Juju and MAAS, the attached nodes will automatically
+receive existing ssh keys and sets up ssh on the node to authenticate
+via key, so you can just login with no password from the server.
+There is also an option in the MAAS web interface to add new ssh keys
+to the nodes (via Preferences in the drop down menu which appears when
+clicking your username in the top-right of the page).
+
+
+Forgot MAAS superuser password
+==============================
+
+As long as you have sudo privileges, this is not a disaster. You can
+use the ``maas`` command to change the password for the MAAS superuser
+on the MAAS server:
+
+    ``sudo maas changepassword root``
+
+
+Need to reconfigure server IP address
+=====================================
+
+If you made a mistake during setup or you just need to reconfigure your MAAS
+server, you can simply run the setup again:
+
+    ``sudo dpkg-reconfigure maas-region-controller``
+
+
+Can't find MAAS webpage
+=======================
+
+The default webpage is located at ``http://<hostname>/MAAS/``. If you can't
+access it, there are a few things to try:
+
+  #. Check that the webserver is running - By default the web interface uses
+     Apache, which runs under the service name *apache2*. To check it, on the
+     MAAS server box you can run ``sudo /etc/init.d/apache2 status``.
+  #. Check that the hostname is correct - It may seem obvious, but check that
+     the hostname is being resolved properly. Try running a browser (even a text
+     mode one like lynx) on the same box as the MAAS server and navigating to
+     the page. If that doesn't work, try ``http://127.0.0.1/MAAS/``, which will
+     always point at the local server.
+  #. If you are still getting "404 - Page not found" errors, check that the MAAS
+     web interface has been installed in the right place. There should be a file
+     present called /usr/share/maas/maas/urls.py
+
+Debugging ephemeral image
+=========================
+
+Backdoor (add a login) to ephemeral images
+------------------------------------------
+
+If you cannot login to an instance, you might have to "backdoor it" in order
+to see what is going wrong. Scott Moser wrote a simple utility that injects a
+user and password into an image. Here's how to add a 'backdoor' user with a
+password to your images::
+
+ sudo apt-get install --assume-yes bzr
+ bzr branch lp:~maas-maintainers/maas/backdoor-image backdoor-image
+
+ imgs=$(echo /var/lib/maas/boot-resources/*/*/*/*/*/*/root-image)
+ for img in $imgs; do
+     [ -f "$img.dist" ] || sudo cp -a --sparse=always $img $img.dist
+ done
+
+ for img in $imgs; do
+     sudo ./backdoor-image/backdoor-image -v --user=backdoor --password-auth --password=ubuntu $img
+ done
+
+Inside the ephemeral image
+--------------------------
+
+Important files for debugging (Someone is likely to ask you for these
+things to help debug)::
+
+ /var/log/cloud-init.log
+ /var/log/boot.log
+ /var/log/cloud-init-output.log
+
+After enlistment or commissioning, the user-data from maas instructs the system
+to power off. To stop that from happening, you can just create a file in /tmp::
+
+ touch /tmp/block-poweroff
+
+After a deployment, the user-data from maas intructs the system to reboot. To
+stop that from happening, you can just create a file in /tmp::
+
+ touch /tmp/block-reboot
+
+MAAS credentials
+----------------
+
+MAAS credentials can be found in 2 places:
+
+#. from the cmdline you'll see a ``url=`` or ``cloud-config-url=``
+   parameter. You can get the cloud-config from that url, which will have
+   credentials::
+
+    $ sed -n 's,.*url=\([^ ]*\).*,\1,p' /proc/cmdline
+    http://10.55.60.194/MAAS/metadata/latest/enlist-preseed/?op=get_enlist_preseed
+
+#. from ``/etc/cloud/cloud.cfg.d/91_kernel_cmdline_url``. The file was pulled
+   from ``url=`` parameter by cloud-init::
+
+    $ sudo cat /etc/cloud/cloud.cfg.d/91_kernel_cmdline
+
+MAAS datasource
+---------------
+
+The cloud-init datasource for MAAS can be invoked as a 'main' for debugging
+purposes. To do so, you need to know the url for the MAAS datasource and a
+config file that contains credentials::
+
+ cfg=$(echo /etc/cloud/cloud.cfg.d/*_cmdline_url.cfg)
+ echo $cfg /etc/cloud/cloud.cfg.d/91_kernel_cmdline_url.cfg
+
+Now get the metadata_url from there::
+
+ url=$(sudo awk '$1 == "metadata_url:" { print $2 }' $cfg)
+ echo $url http://10.55.60.194/MAAS/metadata/enlist
+
+Invoke the client /usr/share/pyshared/cloudinit/sources/DataSourceMAAS.py
+The client has --help Usage also, but here is an example of how to use it::
+
+ $ maasds="/usr/share/pyshared/cloudinit/sources/DataSourceMAAS.py"
+ $ sudo python $maasds --config=$cfg get $url
+ == http://10.55.60.194/MAAS/metadata/enlist ==
+ 2012-03-01
+ latest
+ $ sudo python $maasds --config=$cfg get $url/latest/meta-data/local-hostname
+ maas-enlisting-node

=== modified file 'docs/version.rst'
--- docs/version.rst	2017-03-15 07:43:23 +0000
+++ docs/version.rst	2017-04-25 09:34:40 +0000
@@ -67,6 +67,7 @@
   Deploy nodes with custom network layout and configuration. Available since
   version 1.9 on Ubuntu deployments. See :ref:`networking` for more about this
   feature.
+<<<<<<< TREE
 
 .. _cap_bridging-interface-ubuntu:
 
@@ -87,3 +88,17 @@
   Clients can pass a username and password and, assuming they are valid,
   receive in return an API token. The caller is *not* logged-in to MAAS
   via a session cookie.
+=======
+
+.. _cap_bridging-interface-ubuntu:
+
+``bridging-interface-ubuntu``
+  Deploy nodes, selectively configuring bridges on network interfaces.
+  Available since 2.1 on Ubuntu deployments.
+
+.. _cap_bridging-automatic-ubuntu:
+
+``bridging-automatic-ubuntu``
+  Deploy nodes, automatically configuring bridges on all interfaces.
+  Available since 2.1 on Ubuntu deployments.
+>>>>>>> MERGE-SOURCE

=== modified file 'setup.py'
=== modified file 'src/maasserver/api/blockdevices.py'
=== modified file 'src/maasserver/api/boot_resources.py'
=== modified file 'src/maasserver/api/boot_source_selections.py'
=== modified file 'src/maasserver/api/dhcpsnippets.py'
=== modified file 'src/maasserver/api/dnsresourcerecords.py'
=== modified file 'src/maasserver/api/dnsresources.py'
=== modified file 'src/maasserver/api/domains.py'
=== modified file 'src/maasserver/api/fabrics.py'
=== modified file 'src/maasserver/api/fannetworks.py'
=== modified file 'src/maasserver/api/interfaces.py'
=== modified file 'src/maasserver/api/ipranges.py'
=== modified file 'src/maasserver/api/machines.py'
--- src/maasserver/api/machines.py	2017-04-21 20:20:53 +0000
+++ src/maasserver/api/machines.py	2017-04-25 09:34:40 +0000
@@ -135,11 +135,15 @@
     'node_type',
     'node_type_name',
     'special_filesystems',
+<<<<<<< TREE
     'pod',
     'default_gateways',
     'current_commissioning_result_id',
     'current_testing_result_id',
     'current_installation_result_id',
+=======
+    'default_gateways',
+>>>>>>> MERGE-SOURCE
 )
 
 # Limited set of machine fields exposed on the anonymous API.
@@ -220,6 +224,7 @@
         """The network interface which is used to boot over the network."""
         return machine.get_boot_interface()
 
+<<<<<<< TREE
     @classmethod
     def pod(handler, machine):
         """The pod this machine is part of."""
@@ -279,6 +284,25 @@
             }
         }
 
+=======
+    @classmethod
+    def default_gateways(handler, machine):
+        """The default gateways that will be used for this machine."""
+        gateways = machine.get_default_gateways()
+        ipv4 = gateways.ipv4.gateway_ip if gateways.ipv4 is not None else None
+        ipv6 = gateways.ipv6.gateway_ip if gateways.ipv6 is not None else None
+        return {
+            "ipv4": {
+                "gateway_ip": ipv4,
+                "link_id": machine.gateway_link_ipv4_id,
+            },
+            "ipv6": {
+                "gateway_ip": ipv6,
+                "link_id": machine.gateway_link_ipv6_id,
+            }
+        }
+
+>>>>>>> MERGE-SOURCE
     @admin_method
     def update(self, request, system_id):
         """Update a specific Machine.

=== modified file 'src/maasserver/api/nodes.py'
=== modified file 'src/maasserver/api/packagerepositories.py'
=== modified file 'src/maasserver/api/partitions.py'
=== modified file 'src/maasserver/api/spaces.py'
--- src/maasserver/api/spaces.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/api/spaces.py	2017-04-25 09:34:40 +0000
@@ -117,6 +117,7 @@
 
     @classmethod
     def subnets(cls, space):
+<<<<<<< TREE
         # Backward compatibility for Juju 2.0.
         if space.id == -1:
                 return Subnet.objects.filter(vlan__space__isnull=True)
@@ -130,6 +131,12 @@
         return space.vlan_set.all()
 
     def read(self, request, id):
+=======
+        """Return all subnets in this space."""
+        return space.subnet_set.all()
+
+    def read(self, request, id):
+>>>>>>> MERGE-SOURCE
         """Read space.
 
         Returns 404 if the space is not found.

=== modified file 'src/maasserver/api/staticroutes.py'
=== modified file 'src/maasserver/api/subnets.py'
--- src/maasserver/api/subnets.py	2017-04-06 18:19:08 +0000
+++ src/maasserver/api/subnets.py	2017-04-25 09:34:40 +0000
@@ -153,13 +153,19 @@
             return Space.UNDEFINED
         return subnet.space.get_name()
 
+<<<<<<< TREE
     def read(self, request, id):
         """\
         Read subnet.
+=======
+    def read(self, request, id):
+        """Read subnet.
+>>>>>>> MERGE-SOURCE
 
         Returns 404 if the subnet is not found.
         """
         return Subnet.objects.get_subnet_or_404(
+<<<<<<< TREE
             id, request.user, NODE_PERMISSION.VIEW)
 
     def update(self, request, id):
@@ -201,6 +207,24 @@
 
         managed
           If False, MAAS should not manage this subnet. (Default: True)
+=======
+            id, request.user, NODE_PERMISSION.VIEW)
+
+    def update(self, request, id):
+        """Update subnet.
+
+        :param name: Name of the subnet.
+        :param description: Description of the subnet.
+        :param vlan: VLAN this subnet belongs to.
+        :param space: Space this subnet is in.
+        :param cidr: The network CIDR for this subnet.
+        :param gateway_ip: The gateway IP address for this subnet.
+        :param rdns_mode: How reverse DNS is handled for this subnet.
+        :param allow_proxy: Configure maas-proxy to allow requests from this \
+            subnet.
+        :param dns_servers: Comma-seperated list of DNS servers for this \
+            subnet.
+>>>>>>> MERGE-SOURCE
 
         Returns 404 if the subnet is not found.
         """
@@ -212,9 +236,14 @@
         else:
             raise MAASAPIValidationError(form.errors)
 
+<<<<<<< TREE
     def delete(self, request, id):
         """\
         Delete subnet.
+=======
+    def delete(self, request, id):
+        """Delete subnet.
+>>>>>>> MERGE-SOURCE
 
         Returns 404 if the subnet is not found.
         """
@@ -224,9 +253,14 @@
         return rc.DELETED
 
     @operation(idempotent=True)
+<<<<<<< TREE
     def reserved_ip_ranges(self, request, id):
         """\
         Lists IP ranges currently reserved in the subnet.
+=======
+    def reserved_ip_ranges(self, request, id):
+        """Lists IP ranges currently reserved in the subnet.
+>>>>>>> MERGE-SOURCE
 
         Returns 404 if the subnet is not found.
         """
@@ -235,9 +269,14 @@
         return subnet.get_ipranges_in_use().render_json()
 
     @operation(idempotent=True)
+<<<<<<< TREE
     def unreserved_ip_ranges(self, request, id):
         """\
         Lists IP ranges currently unreserved in the subnet.
+=======
+    def unreserved_ip_ranges(self, request, id):
+        """Lists IP ranges currently unreserved in the subnet.
+>>>>>>> MERGE-SOURCE
 
         Returns 404 if the subnet is not found.
         """
@@ -247,8 +286,13 @@
             include_purpose=False)
 
     @operation(idempotent=True)
+<<<<<<< TREE
     def statistics(self, request, id):
         """\
+=======
+    def statistics(self, request, id):
+        """
+>>>>>>> MERGE-SOURCE
         Returns statistics for the specified subnet, including:
 
         num_available: the number of available IP addresses
@@ -286,8 +330,13 @@
             include_suggestions=include_suggestions)
 
     @operation(idempotent=True)
+<<<<<<< TREE
     def ip_addresses(self, request, id):
         """\
+=======
+    def ip_addresses(self, request, id):
+        """
+>>>>>>> MERGE-SOURCE
         Returns a summary of IP addresses assigned to this subnet.
 
         Optional parameters

=== modified file 'src/maasserver/api/tests/test_api.py'
=== modified file 'src/maasserver/api/tests/test_blockdevice.py'
=== modified file 'src/maasserver/api/tests/test_boot_resources.py'
=== modified file 'src/maasserver/api/tests/test_dhcpsnippets.py'
=== modified file 'src/maasserver/api/tests/test_enlistment.py'
=== modified file 'src/maasserver/api/tests/test_interfaces.py'
=== modified file 'src/maasserver/api/tests/test_machine.py'
=== modified file 'src/maasserver/api/tests/test_vlans.py'
=== modified file 'src/maasserver/api/tests/test_volume_groups.py'
=== modified file 'src/maasserver/api/version.py'
--- src/maasserver/api/version.py	2017-03-15 07:43:23 +0000
+++ src/maasserver/api/version.py	2017-04-25 09:34:40 +0000
@@ -21,9 +21,14 @@
 CAP_DEVICES_MANAGEMENT = 'devices-management'
 CAP_STORAGE_DEPLOYMENT_UBUNTU = 'storage-deployment-ubuntu'
 CAP_NETWORK_DEPLOYMENT_UBUNTU = 'network-deployment-ubuntu'
+<<<<<<< TREE
 CAP_BRIDGING_INTERFACE_UBUNTU = 'bridging-interface-ubuntu'
 CAP_BRIDGING_AUTOMATIC_UBUNTU = 'bridging-automatic-ubuntu'
 CAP_AUTHENTICATE_API = 'authenticate-api'
+=======
+CAP_BRIDGING_INTERFACE_UBUNTU = 'bridging-interface-ubuntu'
+CAP_BRIDGING_AUTOMATIC_UBUNTU = 'bridging-automatic-ubuntu'
+>>>>>>> MERGE-SOURCE
 
 API_CAPABILITIES_LIST = [
     CAP_NETWORKS_MANAGEMENT,
@@ -32,9 +37,14 @@
     CAP_DEVICES_MANAGEMENT,
     CAP_STORAGE_DEPLOYMENT_UBUNTU,
     CAP_NETWORK_DEPLOYMENT_UBUNTU,
+<<<<<<< TREE
     CAP_BRIDGING_INTERFACE_UBUNTU,
     CAP_BRIDGING_AUTOMATIC_UBUNTU,
     CAP_AUTHENTICATE_API,
+=======
+    CAP_BRIDGING_INTERFACE_UBUNTU,
+    CAP_BRIDGING_AUTOMATIC_UBUNTU,
+>>>>>>> MERGE-SOURCE
     ]
 
 

=== modified file 'src/maasserver/api/vlans.py'
=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2017-03-29 21:13:51 +0000
+++ src/maasserver/compose_preseed.py	2017-04-25 09:34:40 +0000
@@ -270,12 +270,18 @@
     """Compose the preseed value for a node being installed with curtin."""
     metadata_url = absolute_reverse('curtin-metadata', base_url=base_url)
     return _compose_cloud_init_preseed(
-        node, token, metadata_url, base_url=base_url)
+        node, token, metadata_url, base_url=base_url, reboot=True)
 
 
 def _compose_cloud_init_preseed(
+<<<<<<< TREE
         node, token, metadata_url, base_url, poweroff_timeout=3600,
         reboot_timeout=1800):
+=======
+        node, token, metadata_url, base_url, poweroff=False,
+        poweroff_timeout=3600, poweroff_condition=None,
+        reboot=False, reboot_timeout=1800):
+>>>>>>> MERGE-SOURCE
     cloud_config = {
         'datasource': {
             'MAAS': {
@@ -318,6 +324,7 @@
         cloud_config['apt_proxy'] = apt_proxy
     # Add APT configuration for new cloud-init (>= 0.7.7-17)
     cloud_config.update(get_archive_config(node=node, preserve_sources=False))
+<<<<<<< TREE
 
     enable_ssh = (node.status in {
         NODE_STATUS.COMMISSIONING,
@@ -344,6 +351,23 @@
                 'condition': 'test ! -e /tmp/block-poweroff',
             }
 
+=======
+    if poweroff:
+        cloud_config['power_state'] = {
+            'delay': 'now',
+            'mode': 'poweroff',
+            'timeout': poweroff_timeout,
+        }
+        if poweroff_condition is not None:
+            cloud_config['power_state']['condition'] = poweroff_condition
+    if reboot:
+        cloud_config['power_state'] = {
+            'delay': 'now',
+            'mode': 'reboot',
+            'timeout': reboot_timeout,
+            'condition': 'test ! -e /tmp/block-reboot'
+        }
+>>>>>>> MERGE-SOURCE
     return "#cloud-config\n%s" % yaml.safe_dump(cloud_config)
 
 

=== modified file 'src/maasserver/config.py'
--- src/maasserver/config.py	2017-03-30 19:40:18 +0000
+++ src/maasserver/config.py	2017-04-25 09:34:40 +0000
@@ -7,7 +7,13 @@
     "RegionConfiguration",
 ]
 
-from formencode.validators import Int
+<<<<<<< TREE
+from formencode.validators import Int
+=======
+from os import path
+
+from formencode.validators import Int
+>>>>>>> MERGE-SOURCE
 from provisioningserver.config import (
     Configuration,
     ConfigurationFile,

=== modified file 'src/maasserver/djangosettings/settings.py'
=== modified file 'src/maasserver/fields.py'
=== modified file 'src/maasserver/forms/tests/test_commissioning.py'
=== modified file 'src/maasserver/forms/tests/test_dnsresource.py'
=== modified file 'src/maasserver/forms/tests/test_interface_link.py'
--- src/maasserver/forms/tests/test_interface_link.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/forms/tests/test_interface_link.py	2017-04-25 09:34:40 +0000
@@ -44,7 +44,12 @@
         })
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__sets_subnet_queryset_to_all_on_interface_wihtout_vlan(self):
+<<<<<<< TREE
+    def test__sets_subnet_queryset_to_all_on_interface_wihtout_vlan(self):
+=======
+    @transactional
+    def test__sets_subnet_queryset_to_all_on_interface_wihtout_vlan(self):
+>>>>>>> MERGE-SOURCE
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface.vlan = None
         interface.save()

=== modified file 'src/maasserver/listener.py'
=== renamed file 'src/maasserver/migrations/south/django16_south_maas19.tar.gz' => 'src/maasserver/migrations/south/django16_south_maas19.tar.gz.OTHER'
Binary files src/maasserver/migrations/south/django16_south_maas19.tar.gz	2016-12-07 12:46:14 +0000 and src/maasserver/migrations/south/django16_south_maas19.tar.gz.OTHER	2017-04-25 09:34:40 +0000 differ
=== modified file 'src/maasserver/models/bmc.py'
=== modified file 'src/maasserver/models/interface.py'
=== modified file 'src/maasserver/models/node.py'
=== modified file 'src/maasserver/models/staticipaddress.py'
--- src/maasserver/models/staticipaddress.py	2017-04-06 18:19:08 +0000
+++ src/maasserver/models/staticipaddress.py	2017-04-25 09:34:40 +0000
@@ -246,6 +246,7 @@
             requested_address = IPAddress(requested_address)
             subnet.validate_static_ip(requested_address)
             return self._attempt_allocation(
+<<<<<<< TREE
                 requested_address, alloc_type, user=user, subnet=subnet)
 
     def _get_special_mappings(self, domain, raw_ttl=False):
@@ -426,6 +427,165 @@
                 mapping[fqdn].ttl = ttl
             mapping[fqdn].ips.add(ip)
         return mapping
+=======
+                requested_address, alloc_type,
+                user=user, subnet=subnet)
+
+    def _get_special_mappings(self, domain, raw_ttl=False):
+        """Get the special mappings, possibly limited to a single Domain.
+
+        This function is responsible for creating these mappings:
+        - any USER_RESERVED IP,
+        - any IP not associated with a Node,
+        - any IP associated with a DNSResource.
+        The caller is responsible for addresses otherwise derived from nodes.
+
+        Because of how the get hostname_ip_mapping code works, we actually need
+        to fetch ALL of the entries for subnets, but forward mappings need to
+        be domain-specific.
+
+        :param domain: limit return to just the given Domain.  If anything
+            other than a Domain is passed in (e.g., a Subnet or None), we
+            return all of the reverse mappings.
+        :param raw_ttl: Boolean, if True then just return the address_ttl,
+            otherwise, coalesce the address_ttl to be the correct answer for
+            zone generation.
+        :return: a (default) dict of hostname: HostnameIPMapping entries.
+        """
+        default_ttl = "%d" % Config.objects.get_config('default_dns_ttl')
+        if isinstance(domain, Domain):
+            # Domains are special in that we only want to have entries for the
+            # domain that we were asked about.  And they can possibly come from
+            # either the child or the parent for glue.
+            where_clause = """
+                AND (
+                    dnsrr.dom2_id = %s OR
+                    node.dom2_id = %s OR
+                    dnsrr.domain_id = %s OR
+                    node.domain_id = %s
+            """
+            query_parms = [domain.id, domain.id, domain.id, domain.id]
+            # And the default domain is extra special, since it needs to have
+            # A/AAAA RRs for any USER_RESERVED addresses that have no name
+            # otherwise attached to them.
+            if domain.is_default():
+                where_clause += """ OR (
+                    dnsrr.fqdn IS NULL AND
+                    node.fqdn IS NULL)
+                """
+            where_clause += ")"
+        else:
+            # There is nothing special about the query for subnets.
+            domain = None
+            where_clause = ""
+            query_parms = []
+        # raw_ttl says that we don't coalesce, but we need to pick one, so we
+        # go with DNSResource if it is involved.
+        if raw_ttl:
+            ttl_clause = """COALESCE(dnsrr.address_ttl, node.address_ttl)"""
+        else:
+            ttl_clause = """
+                COALESCE(
+                    dnsrr.address_ttl,
+                    dnsrr.ttl,
+                    node.address_ttl,
+                    node.ttl,
+                    %s)""" % default_ttl
+        # And here is the SQL query of doom.  Build up inner selects to get the
+        # view of a DNSResource (and Node) that we need, and finally use
+        # domain2 to handle the case where an FQDN is also the name of a domain
+        # that we know.
+        sql_query = """
+            SELECT
+                COALESCE(dnsrr.fqdn, node.fqdn) AS fqdn,
+                node.system_id,
+                node.node_type,
+                """ + ttl_clause + """ AS ttl,
+                staticip.ip
+            FROM
+                maasserver_staticipaddress AS staticip
+            LEFT JOIN (
+                /* Create a dnsrr that has what we need. */
+                SELECT
+                    CASE WHEN dnsrr.name = '@' THEN
+                        dom.name
+                    ELSE
+                        CONCAT(dnsrr.name, '.', dom.name)
+                    END AS fqdn,
+                    dom.name as dom_name,
+                    dnsrr.domain_id,
+                    dnsrr.address_ttl,
+                    dom.ttl,
+                    dia.staticipaddress_id AS dnsrr_sip_id,
+                    dom2.id AS dom2_id
+                FROM maasserver_dnsresource_ip_addresses AS dia
+                JOIN maasserver_dnsresource AS dnsrr ON
+                    dia.dnsresource_id = dnsrr.id
+                JOIN maasserver_domain AS dom ON
+                    dnsrr.domain_id = dom.id
+                LEFT JOIN maasserver_domain AS dom2 ON
+                    CONCAT(dnsrr.name, '.', dom.name) = dom2.name OR (
+                        dnsrr.name = '@' AND
+                        dom.name SIMILAR TO CONCAT('[-A-Za-z0-9]*.', dom2.name)
+                    )
+                ) AS dnsrr ON
+                    dnsrr_sip_id = staticip.id
+            LEFT JOIN (
+                /* Create a node that has what we need. */
+                SELECT
+                    CONCAT(nd.hostname, '.', dom.name) AS fqdn,
+                    dom.name as dom_name,
+                    nd.system_id,
+                    nd.node_type,
+                    nd.domain_id,
+                    nd.address_ttl,
+                    dom.ttl,
+                    iia.staticipaddress_id AS node_sip_id,
+                    dom2.id AS dom2_id
+                FROM maasserver_interface_ip_addresses AS iia
+                JOIN maasserver_interface AS iface ON
+                    iia.interface_id = iface.id
+                JOIN maasserver_node AS nd ON
+                    iface.node_id = nd.id
+                JOIN maasserver_domain AS dom ON
+                    nd.domain_id = dom.id
+                LEFT JOIN maasserver_domain AS dom2 ON
+                    CONCAT(nd.hostname, '.', dom.name) = dom2.name
+                ) AS node ON
+                    node_sip_id = staticip.id
+            WHERE
+                staticip.ip IS NOT NULL AND
+                host(staticip.ip) != '' AND
+                (
+                    staticip.alloc_type = %s OR
+                    node.fqdn IS NULL OR
+                    dnsrr IS NOT NULL
+                )""" + where_clause + """
+        """
+        default_domain = Domain.objects.get_default_domain()
+        mapping = defaultdict(HostnameIPMapping)
+        cursor = connection.cursor()
+        query_parms = [IPADDRESS_TYPE.USER_RESERVED] + query_parms
+        cursor.execute(sql_query, query_parms)
+        for (fqdn, system_id, node_type, ttl,
+                ip) in cursor.fetchall():
+            if fqdn is None or fqdn == '':
+                fqdn = "%s.%s" % (
+                    get_ip_based_hostname(ip), default_domain.name)
+            mapping[fqdn].node_type = node_type
+            mapping[fqdn].system_id = system_id
+            mapping[fqdn].ttl = ttl
+            mapping[fqdn].ips.add(ip)
+        return mapping
+
+    @asynchronous
+    def _async_find_free_ip(self, *args, **kwargs):
+        return deferToDatabase(
+            transactional(self._find_free_ip), *args, **kwargs)
+
+    def _find_free_ip(self, subnet, exclude_addresses=None):
+        return subnet.get_next_ip_for_allocation(exclude_addresses)
+>>>>>>> MERGE-SOURCE
 
     def get_hostname_ip_mapping(self, domain_or_subnet, raw_ttl=False):
         """Return hostname mappings for `StaticIPAddress` entries.

=== modified file 'src/maasserver/models/subnet.py'
=== modified file 'src/maasserver/models/tests/test_bmc.py'
=== modified file 'src/maasserver/models/tests/test_interface.py'
=== modified file 'src/maasserver/models/tests/test_node.py'
=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
--- src/maasserver/models/tests/test_staticipaddress.py	2017-04-06 16:38:44 +0000
+++ src/maasserver/models/tests/test_staticipaddress.py	2017-04-25 09:34:40 +0000
@@ -40,8 +40,12 @@
     MAASServerTestCase,
     MAASTransactionServerTestCase,
 )
+<<<<<<< TREE
 from maasserver.utils import orm
 from maasserver.utils.dns import get_ip_based_hostname
+=======
+from maasserver.utils.dns import get_ip_based_hostname
+>>>>>>> MERGE-SOURCE
 from maasserver.utils.orm import (
     reload_object,
     transactional,
@@ -1082,9 +1086,14 @@
         self.expectThat(mappings, HasLength(0))
 
     def test_user_reserved_addresses_included_in_correct_domains(self):
+<<<<<<< TREE
         # Generate some addresses with no names attached, and some more in each
         # of two (non-default) domains.  Make sure that they wind up in the
         # right domains, and not in other domains.
+=======
+        # Generate addresses in two domains, and make sure that they wind up in
+        # the right domains, and not in other domains.
+>>>>>>> MERGE-SOURCE
         domain0 = Domain.objects.get_default_domain()
         domain1 = factory.make_Domain()
         domain2 = factory.make_Domain()
@@ -1277,6 +1286,138 @@
         self.assertEqual({
             dnsrr.fqdn: HostnameIPMapping(None, 30, {ip.ip}, None)}, mappings)
 
+    def test_dns_resources_only_have_correct_domain(self):
+        # Create two DNS resources pointing to the same IP, and make sure that
+        # they only get the forward mapping that they should have, but get both
+        # reverse mappings, as is proper.
+        domain0 = Domain.objects.get_default_domain()
+        domain1 = factory.make_Domain()
+        domain2 = factory.make_Domain()
+        subnet = factory.make_Subnet()
+        ip = factory.make_StaticIPAddress(subnet=subnet)
+        name1 = factory.make_name('label')
+        name2 = factory.make_name('label')
+        factory.make_DNSResource(name=name1, ip_addresses=[ip], domain=domain1)
+        factory.make_DNSResource(name=name2, ip_addresses=[ip], domain=domain2)
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain0)
+        self.expectThat(mappings, HasLength(0))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain1)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get('%s.%s' % (name1, domain1.name)),
+            HostnameIPMapping(None, 30, {ip.ip}, None))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain2)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get('%s.%s' % (name2, domain2.name)),
+            HostnameIPMapping(None, 30, {ip.ip}, None))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(subnet)
+        self.assertEqual(
+            mappings, {
+                "%s.%s" % (name1, domain1.name): HostnameIPMapping(
+                    None, 30, {ip.ip}, None),
+                "%s.%s" % (name2, domain2.name): HostnameIPMapping(
+                    None, 30, {ip.ip}, None)})
+
+    def test_user_reserved_IP_on_node_or_default_domain_not_both(self):
+        # ip1 gets assigned to an interface on a node in domain1
+        # ip2 is not assigned to anything.
+        # ip1 should show up for the node, in domain1, and the subnet.
+        # ip2 should show up in the default domain, and the subnet.
+        domain0 = Domain.objects.get_default_domain()
+        domain1 = factory.make_Domain()
+        subnet = factory.make_Subnet()
+        ip1 = factory.make_StaticIPAddress(subnet=subnet)
+        ip2 = factory.make_StaticIPAddress(subnet=subnet)
+        name2 = "%s.%s" % (get_ip_based_hostname(ip2.ip), domain0.name)
+        node = factory.make_Node(
+            interface=True,
+            domain=domain1,
+            vlan=subnet.vlan)
+        node.interface_set.first().ip_addresses.add(ip1)
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain0)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings, {
+                name2: HostnameIPMapping(None, 30, {ip2.ip}, None)})
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain1)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get(node.fqdn),
+            HostnameIPMapping(node.system_id, 30, {ip1.ip}, node.node_type))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(subnet)
+        self.assertEqual(
+            mappings, {
+                node.fqdn: HostnameIPMapping(
+                    node.system_id, 30, {ip1.ip}, node.node_type),
+                name2: HostnameIPMapping(None, 30, {ip2.ip}, None)})
+
+    def test_node_glue_correctly_generated(self):
+        # Given node "foo.bar.com" and a "foo.bar.com" domain (in addition to
+        # "bar.com"), with an IP associated with it, make sure that both
+        # domains are correctly populated.
+        domain0 = Domain.objects.get_default_domain()
+        parent = factory.make_Domain(name=factory.make_name('parent'))
+        name = factory.make_name('child')
+        domain = factory.make_Domain(name="%s.%s" % (name, parent.name))
+        subnet = factory.make_Subnet()
+        ip = factory.make_StaticIPAddress(subnet=subnet)
+        node = factory.make_Node(
+            interface=True,
+            domain=parent,
+            hostname=name,
+            vlan=subnet.vlan)
+        node.interface_set.first().ip_addresses.add(ip)
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain0)
+        self.expectThat(mappings, HasLength(0))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(parent)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get(node.fqdn),
+            HostnameIPMapping(node.system_id, 30, {ip.ip}, node.node_type))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get(node.fqdn),
+            HostnameIPMapping(node.system_id, 30, {ip.ip}, node.node_type))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(subnet)
+        self.assertEqual(
+            mappings, {
+                node.fqdn: HostnameIPMapping(
+                    node.system_id, 30, {ip.ip}, node.node_type)})
+
+    def test_dnsrr_glue_correctly_generated(self):
+        # Given DNSResource "foo.bar.com" and a "foo.bar.com" domain (in
+        # addition to "bar.com"), with an IP associated with it, make sure that
+        # both domains are correctly populated.
+        domain0 = Domain.objects.get_default_domain()
+        parent = factory.make_Domain(name=factory.make_name('parent'))
+        name = factory.make_name('child')
+        domain = factory.make_Domain(name="%s.%s" % (name, parent.name))
+        subnet = factory.make_Subnet()
+        ip = factory.make_StaticIPAddress(subnet=subnet)
+        dnsrr = factory.make_DNSResource(
+            domain=domain,
+            name='@',
+            ip_addresses=[ip])
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain0)
+        self.expectThat(mappings, HasLength(0))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(parent)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get(dnsrr.fqdn),
+            HostnameIPMapping(None, 30, {ip.ip}, None))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(domain)
+        self.expectThat(mappings, HasLength(1))
+        self.assertEqual(
+            mappings.get(dnsrr.fqdn),
+            HostnameIPMapping(None, 30, {ip.ip}, None))
+        mappings = StaticIPAddress.objects.get_hostname_ip_mapping(subnet)
+        self.assertEqual(
+            mappings, {
+                dnsrr.fqdn: HostnameIPMapping(
+                    None, 30, {ip.ip}, None)})
+
 
 class TestRenderJSON(MAASServerTestCase):
 

=== modified file 'src/maasserver/models/tests/test_subnet.py'
--- src/maasserver/models/tests/test_subnet.py	2017-04-17 19:09:26 +0000
+++ src/maasserver/models/tests/test_subnet.py	2017-04-25 09:34:40 +0000
@@ -1012,6 +1012,7 @@
         discovery = subnet.get_least_recently_seen_unknown_neighbour()
         self.assertThat(discovery.ip, Equals("10.0.0.2"))
 
+<<<<<<< TREE
     def test__returns_least_recently_seen_neighbour_excludes_in_use(self):
         # Note: 10.0.0.0/30 --> 10.0.0.1 and 10.0.0.0.2 are usable.
         subnet = factory.make_Subnet(
@@ -1051,6 +1052,25 @@
         discovery = subnet.get_least_recently_seen_unknown_neighbour()
         self.assertThat(discovery.ip, Equals("10.0.0.2"))
 
+=======
+    def test__returns_least_recently_seen_neighbour_excludes_in_use(self):
+        # Note: 10.0.0.0/30 --> 10.0.0.1 and 10.0.0.0.2 are usable.
+        subnet = factory.make_Subnet(
+            cidr="10.0.0.0/30", gateway_ip=None, dns_servers=None)
+        rackif = factory.make_Interface(vlan=subnet.vlan)
+        now = datetime.now()
+        yesterday = now - timedelta(days=1)
+        factory.make_Discovery(
+            ip="10.0.0.1", interface=rackif, updated=now)
+        factory.make_Discovery(
+            ip="10.0.0.2", interface=rackif, updated=yesterday)
+        factory.make_IPRange(
+            subnet, start_ip="10.0.0.2", end_ip="10.0.0.2",
+            type=IPRANGE_TYPE.RESERVED)
+        discovery = subnet.get_least_recently_seen_unknown_neighbour()
+        self.assertThat(discovery.ip, Equals("10.0.0.1"))
+
+>>>>>>> MERGE-SOURCE
     def test__returns_none_if_no_neighbours(self):
         # Note: 10.0.0.0/30 --> 10.0.0.1 and 10.0.0.0.2 are usable.
         subnet = factory.make_Subnet(

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2017-03-21 18:24:36 +0000
+++ src/maasserver/preseed.py	2017-04-25 09:34:40 +0000
@@ -471,6 +471,7 @@
         get_node_preseed_context(
             node, osystem, series, rack_controller=rack_controller))
     context.update(get_curtin_context(node, rack_controller=rack_controller))
+<<<<<<< TREE
     deprecated_context_variables = [
         'main_archive_hostname', 'main_archive_directory',
         'ports_archive_hostname', 'ports_archive_directory',
@@ -506,6 +507,43 @@
     if node.distro_series == "precise":
         config['power_state'] = {'mode': 'reboot'}
     return yaml.safe_dump(config)
+=======
+    deprecated_context_variables = [
+        'main_archive_hostname', 'main_archive_directory',
+        'ports_archive_hostname', 'ports_archive_directory',
+        'enable_http_proxy', 'http_proxy']
+    deprecated_config_variables = []
+    for var in deprecated_context_variables:
+        if var not in context:
+            deprecated_context_variables.remove(var)
+    context.update(get_node_deprecated_preseed_context())
+    config = yaml.load(template.substitute(**context))
+    # Remove deprecated config from the curtin preseed.
+    if 'power_state' in config:
+        del config['power_state']
+        deprecated_config_variables.append('power_state')
+    if 'apt_proxy' in config:
+        deprecated_config_variables.append('apt_proxy')
+        del config['apt_proxy']
+    if 'apt_mirrors' in config:
+        deprecated_config_variables.append('apt_mirrors')
+        del config['apt_mirrors']
+    if deprecated_context_variables:
+        log.warn(
+            "WARNING: '%s' contains deprecated preseed "
+            "variables. Please remove: %s" % (
+                template.name, ", ".join(deprecated_context_variables)))
+    if deprecated_config_variables:
+        log.warn(
+            "WARNING: '%s' contains deprecated preseed "
+            "configuration. Please remove: %s" % (
+                template.name, ", ".join(deprecated_config_variables)))
+    # Precise does not support cloud-init performing the reboot, so curtin
+    # must have this statement.
+    if node.distro_series == "precise":
+        config['power_state'] = {'mode': 'reboot'}
+    return yaml.dump(config)
+>>>>>>> MERGE-SOURCE
 
 
 def get_curtin_context(node, rack_controller=None):

=== modified file 'src/maasserver/rpc/regionservice.py'
=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
=== added file 'src/maasserver/static/assets/images/icons/account.svg.OTHER'
--- src/maasserver/static/assets/images/icons/account.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/account.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96.000001"><g color="#000"><path overflow="visible" fill="none" d="M96 0v96H0V0z"/><path style="line-height:normal;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;shape-padding:0;isolation:auto;mix-blend-mode:normal" d="M48 6C24.828 6 6 24.83 6 48s18.828 41.998 42 41.998S90 71.17 90 48C90 24.83 71.172 6 48 6zm0 4c21.01 0 37.998 16.99 37.998 38 0 9.324-3.35 17.852-8.908 24.46a25.598 25.598 0 0 0-4.94-7.495c-1.955-2.062-4.308-3.79-7.017-5.192a24.975 24.975 0 0 1-3.697 2.682c3.188 1.365 5.775 3.117 7.81 5.264h.002c2.162 2.274 3.75 4.902 4.81 7.94C67.26 82.07 58.1 86 48 86c-10.135 0-19.325-3.96-26.133-10.412 1.123-3.013 2.706-5.623 4.78-7.875 2.208-2.328 5.055-4.2 8.626-5.606 3.507-1.38 7.732-2.106 12.696-2.11L48 60c2.886 0 5.613-.508 8.12-1.54l.017-.01.017-.01c2.49-1.078 4.66-2.615 6.45-4.575 1.84-1.96 3.258-4.302 4.242-6.967.994-2.693 1.476-5.672 1.476-8.898v-.002c0-3.18-.484-6.132-1.476-8.822-.98-2.706-2.397-5.073-4.24-7.037-1.79-1.966-3.973-3.483-6.47-4.515C53.623 16.54 50.89 16 48 16c-2.892 0-5.624.54-8.135 1.625a18.703 18.703 0 0 0-6.54 4.5l-.01.012-.01.01c-1.792 1.968-3.176 4.333-4.155 7.037l-.002.004c-.99 2.686-1.47 5.634-1.47 8.81 0 3.226.48 6.207 1.474 8.9.98 2.657 2.366 4.993 4.153 6.954l.01.01.01.01a19.447 19.447 0 0 0 4.152 3.345c-1.274.325-2.5.71-3.668 1.17-4.03 1.587-7.416 3.776-10.074 6.58l-.01.012-.01.01c-2.007 2.177-3.62 4.66-4.855 7.41a37.86 37.86 0 0 1-8.858-24.4c0-21.01 16.99-38 37.998-38zm0 9.998c2.408 0 4.573.438 6.562 1.3l.018.01.016.006c1.995.823 3.66 1.983 5.066 3.526l.01.012.01.01c1.453 1.548 2.587 3.42 3.406 5.685l.002.008.004.006c.81 2.195 1.226 4.662 1.226 7.44 0 2.83-.418 5.323-1.226 7.514-.818 2.216-1.953 4.07-3.412 5.623l-.01.01-.01.013c-1.408 1.546-3.083 2.735-5.086 3.606C52.584 55.583 50.412 56 48 56c-2.413 0-4.586-.416-6.578-1.234a15.41 15.41 0 0 1-5.168-3.62c-1.412-1.553-2.528-3.41-3.348-5.632-.808-2.19-1.226-4.684-1.226-7.514 0-2.778.417-5.245 1.226-7.44l.002-.005.004-.008c.82-2.27 1.936-4.147 3.342-5.693a14.599 14.599 0 0 1 5.15-3.54l.016-.007.017-.008c1.99-.864 4.156-1.302 6.563-1.302z" font-family="sans-serif" white-space="normal" overflow="visible" solid-color="#000000" fill="gray"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/add-logical-volume.svg.OTHER'
--- src/maasserver/static/assets/images/icons/add-logical-volume.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/add-logical-volume.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.2333398 4.2333403"><path color="#000" overflow="visible" opacity=".12" fill="none" d="M4.233 4.233V0H0v4.233z"/><path d="M3.175 2.38v.795H2.38v.265h.795v.793h.265V3.44h.793v-.265H3.44V2.38zM2.38 0v1.852h1.853V0zm.266.265H3.97v1.323H2.645zM0 0v1.852h1.852V0zm.265.265h1.323v1.323H.264zM0 2.38v1.853h1.852V2.38zm.265.266h1.323V3.97H.264z" color="#000" overflow="visible" fill="gray"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/add-partition.svg.OTHER'
--- src/maasserver/static/assets/images/icons/add-partition.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/add-partition.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.2333398 4.2333315"><path color="#000" overflow="visible" opacity=".12" fill="none" d="M4.233 4.233V0H0v4.233z"/><path d="M0 .794V3.44h1.852v-.265H.265V1.058h1.587V.794zm3.175.529v.794H2.38v.264h.795v.795h.265V2.38h.793v-.263H3.44v-.794zM1.852.264h.265v.53h-.265z" color="#000" overflow="visible" fill="gray"/><path color="#000" overflow="visible" fill="gray" d="M1.852 1.058h.265v.53h-.265zm0 .794h.265v.53h-.265zm0 .793h.265v.53h-.265zm0 .795h.265v.528h-.265z"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/add.svg.OTHER'
--- src/maasserver/static/assets/images/icons/add.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/add.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>add</title><g fill="gray" fill-rule="evenodd"><path d="M20 9v2H0V9z"/><path d="M11 20H9V0h2z"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/cross-orange.svg.OTHER'
--- src/maasserver/static/assets/images/icons/cross-orange.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/cross-orange.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="11" height="10" viewBox="0 0 11 10" xmlns="http://www.w3.org/2000/svg"><title>Imported Layers</title><path d="M2 1l8 8m0-8L2 9" stroke="#DD4814" stroke-width="3" stroke-linejoin="round" fill="none" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/cross.svg.OTHER'
--- src/maasserver/static/assets/images/icons/cross.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/cross.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="11" height="10" viewBox="0 0 11 10" xmlns="http://www.w3.org/2000/svg"><title>Imported Layers Copy</title><path d="M2 1l8 8m0-8L2 9" stroke="#888" stroke-width="3" stroke-linejoin="round" fill="none"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/cross_orange.svg.OTHER'
--- src/maasserver/static/assets/images/icons/cross_orange.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/cross_orange.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="11" height="10" viewBox="0 0 11 10" xmlns="http://www.w3.org/2000/svg"><title>Imported Layers</title><path d="M2 1l8 8m0-8L2 9" stroke="#DD4814" stroke-width="3" stroke-linejoin="round" fill="none"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/debug.svg.OTHER'
--- src/maasserver/static/assets/images/icons/debug.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/debug.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>debug icon 8@2x</title><path d="M11.673 12.994L14.68 16l1.313-1.316-3.004-3.005A5.501 5.501 0 0 0 8.5 3C5.46 3 3 5.463 3 8.5 3 11.54 5.46 14 8.5 14c1.18 0 2.276-.37 3.173-1.006zM4.25 8.5a4.25 4.25 0 1 1 8.5 0 4.25 4.25 0 0 1-8.5 0zM6 9h5v1H6V9zm0-2h5v1H6V7zM4.71 0C2.845 0 1.646.095.87.87.093 1.648 0 2.847 0 4.716v4.568c0 1.87.094 3.068.87 3.844.667.668 1.68.824 3.13.857v-1.002c-1.327-.044-2.075-.21-2.424-.56-.41-.41-.576-1.318-.576-3.14V4.716c0-1.82.167-2.727.576-3.137C1.986 1.168 2.892 1 4.71 1h4.577c1.82 0 2.726.17 3.135.578.348.35.514 1.097.558 2.422h1.006c-.033-1.45-.19-2.46-.857-3.13C12.352.096 11.153 0 9.286 0H4.71z" fill="gray" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/delete.svg.OTHER'
--- src/maasserver/static/assets/images/icons/delete.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/delete.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="19" height="24" viewBox="0 0 19 24" xmlns="http://www.w3.org/2000/svg"><title>remove</title><g fill="gray" fill-rule="evenodd"><path d="M1 5v15.898C1 24 2.067 24 4.733 24h9.534C16.933 24 18 24 18 20.9V5H1zm2 1.6h2V18h1V6.6h3V18h1V6.6h3V18h1V6.6h2v13.216C16 22 15.884 22 13.77 22H5.23C3.117 22 3 22 3 19.816V6.6z"/><path d="M0 5h19v2H0M7.014.547V2.74L8 2.395V1.2c.59-.12 1.004-.203 1.502-.2.498.003.917.086 1.498.2v1.195l1 .345V.547C10.872.072 10.46 0 9.507 0c-.954 0-1.42.087-2.493.547z"/><path d="M9.5 2C6.667 2 3.828 2.52 1 3.49V6h17V3.49C15.166 2.54 12.333 2 9.5 2z"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/edit.svg.OTHER'
--- src/maasserver/static/assets/images/icons/edit.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/edit.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><title>edit</title><g fill="gray" fill-rule="evenodd"><path d="M17 15h5v1h-5zm-3 3h8v1h-8zm-3 3h11v1H11zm5.75-21L3.47 13.517S.956 17.465 0 21.987v.004l.002.004V22c4.532-.955 8.48-3.472 8.48-3.472L22 5.25 16.75 0zM4.51 14.555L7.454 17.5c-.2.114-2.99 2.064-5.544 2.602V20.093l-.002-.003c.537-2.546 2.485-5.334 2.602-5.537v.002z"/><path d="M2.234 18l1.85 1.85L1 21"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/green-tick.svg.OTHER'
--- src/maasserver/static/assets/images/icons/green-tick.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/green-tick.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="22" viewBox="0 0 22 16"><title>textfield-saved</title><path d="M20.04.343l-.154.136-11.138 9.756-6.53-5.601L.246 6.866l8.505 8.948L21.687 2.2 20.04.343z" fill="#38B44A" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/help.svg.OTHER'
--- src/maasserver/static/assets/images/icons/help.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/help.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><title>help</title><g fill="none" fill-rule="evenodd"><path d="M0 0h22v22H0z"/><path d="M11.011 5.902c-.43 0-.843.056-1.237.166a5.314 5.314 0 0 0-1.238.499L7.91 4.849a6.271 6.271 0 0 1 1.55-.609A6.893 6.893 0 0 1 11.27 4c.74 0 1.349.105 1.829.314.48.197.862.45 1.145.757.283.308.48.646.59 1.016.112.37.167.726.167 1.07 0 .42-.08.795-.24 1.127-.148.333-.339.64-.573.924a9.395 9.395 0 0 1-.757.812c-.27.247-.523.505-.757.776-.234.258-.43.536-.59.831a2.199 2.199 0 0 0-.222.997v.222c0 .074.006.148.018.221H9.96a3.685 3.685 0 0 1-.056-.387 4.914 4.914 0 0 1-.018-.407c0-.406.067-.77.203-1.09.135-.32.307-.615.517-.886a7.9 7.9 0 0 1 .665-.757c.246-.234.474-.468.683-.702a3.91 3.91 0 0 0 .517-.72c.135-.246.203-.517.203-.812 0-.407-.141-.739-.425-.998-.27-.27-.683-.406-1.237-.406zM12.477 16.01c0 .43-.141.781-.424 1.052-.284.27-.634.406-1.053.406-.406 0-.757-.135-1.053-.406-.283-.271-.424-.622-.424-1.053 0-.43.141-.782.424-1.052A1.47 1.47 0 0 1 11 14.532c.419 0 .77.141 1.053.425.283.27.424.621.424 1.052z" fill="gray"/><circle stroke="gray" stroke-width="1.5" cx="11" cy="11" r="10.25"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/info-mono.svg.OTHER'
--- src/maasserver/static/assets/images/icons/info-mono.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/info-mono.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M1.066 0C.476 0 0 .475 0 1.066v13.868C0 15.524.475 16 1.066 16h13.868c.59 0 1.066-.475 1.066-1.066V1.066C16 .476 15.525 0 14.934 0H1.066zM7 3h2v2H7V3zm0 4h2v6H7V7z" overflow="visible" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/info.svg.OTHER'
--- src/maasserver/static/assets/images/icons/info.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/info.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>info</title><g fill="none" fill-rule="evenodd"><path d="M0 0h16v16H0z"/><g fill="#19B6EE"><path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 14.5c-3.6 0-6.5-2.9-6.5-6.5S4.4 1.5 8 1.5s6.5 2.9 6.5 6.5-2.9 6.5-6.5 6.5z"/><path d="M7 10h2v2H7zM7 4h2v5H7z"/></g></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/logical-volume.svg.OTHER'
--- src/maasserver/static/assets/images/icons/logical-volume.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/logical-volume.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.2333398 4.2333403"><path style="marker:none" color="#000" overflow="visible" opacity=".12" fill="none" d="M4.233 4.233V0H0v4.233z"/><path style="marker:none" d="M3.175 2.381v.794h-.794v.265h.794v.793h.265V3.44h.793v-.265H3.44v-.794zM2.381 0v1.852h1.852V0zm.265.265h1.323v1.323H2.646zM0 0v1.852h1.852V0zm.265.265h1.323v1.323H.264zM0 2.381v1.852h1.852V2.381zm.265.265h1.323v1.323H.264z" color="#000" overflow="visible" fill="gray"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/magnifying_glass.svg.OTHER'
--- src/maasserver/static/assets/images/icons/magnifying_glass.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/magnifying_glass.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><title>magnifying_glass</title><g fill="none" fill-rule="evenodd"><path fill="gray" d="M16.655 14.67l-1.995 1.997L19.994 22l1.994-1.997z"/><ellipse stroke="gray" stroke-width="1.5" cx="9.5" cy="9.5" rx="8.708" ry="8.708"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/mount.svg.OTHER'
--- src/maasserver/static/assets/images/icons/mount.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/mount.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.2333493 4.2333317"><path style="marker:none" color="#000" overflow="visible" opacity=".12" fill="none" d="M4.233 4.233V0H0v4.233z"/><path d="M0 .265v.793h4.233V.265zm3.44.264h.529v.265h-.53zM3.175 2.117v.793h-.794v.265h.794v.794h.265v-.794h.793V2.91H3.44v-.793z" style="marker:none" color="#000" overflow="visible" fill="gray"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/partition.svg.OTHER'
--- src/maasserver/static/assets/images/icons/partition.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/partition.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.2333398 4.2333315"><path style="marker:none" color="#000" overflow="visible" opacity=".12" fill="none" d="M4.233 4.233V0H0v4.233z"/><path d="M0 .794V3.44h1.852v-.265H.265V1.058h1.587V.794zM3.175 1.323v.794h-.794v.264h.794v.794h.265v-.794h.793v-.264H3.44v-.794zM1.852.264h.265v.53h-.265z" style="marker:none" color="#000" overflow="visible" fill="gray"/><path style="marker:none" color="#000" overflow="visible" fill="gray" d="M1.852 1.058h.265v.53h-.265zM1.852 1.852h.265v.53h-.265zM1.852 2.645h.265v.53h-.265zM1.852 3.44h.265v.528h-.265z"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/power-error.svg.OTHER'
--- src/maasserver/static/assets/images/icons/power-error.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/power-error.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="14" height="15" viewBox="0 0 14 15" xmlns="http://www.w3.org/2000/svg"><title>power-error</title><path d="M11.04 2.323l-.324 2.268a5.017 5.017 0 0 1 1.352 3.426c0 2.787-2.274 5.056-5.068 5.056-2.794 0-5.067-2.269-5.067-5.056a5.02 5.02 0 0 1 1.351-3.426L2.96 2.323A6.935 6.935 0 0 0 0 8.017C0 11.867 3.14 15 7 15s7-3.132 7-6.983c0-2.283-1.1-4.382-2.96-5.694zM6 0h2v7H6V0z" fill="#DB3832" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/power-off.svg.OTHER'
--- src/maasserver/static/assets/images/icons/power-off.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/power-off.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="14" height="15" viewBox="0 0 14 15" xmlns="http://www.w3.org/2000/svg"><title>power-off</title><path d="M11.04 2.323l-.324 2.268a5.017 5.017 0 0 1 1.352 3.426c0 2.787-2.274 5.056-5.068 5.056-2.794 0-5.067-2.269-5.067-5.056a5.02 5.02 0 0 1 1.351-3.426L2.96 2.323A6.935 6.935 0 0 0 0 8.017C0 11.867 3.14 15 7 15s7-3.132 7-6.983c0-2.283-1.1-4.382-2.96-5.694zM6 0h2v7H6V0z" fill="#D2D2D2" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/power-on.svg.OTHER'
--- src/maasserver/static/assets/images/icons/power-on.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/power-on.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="14" height="15" viewBox="0 0 14 15" xmlns="http://www.w3.org/2000/svg"><title>power-on</title><path d="M11.04 2.323l-.324 2.268a5.017 5.017 0 0 1 1.352 3.426c0 2.787-2.274 5.056-5.068 5.056-2.794 0-5.067-2.269-5.067-5.056a5.02 5.02 0 0 1 1.351-3.426L2.96 2.323A6.935 6.935 0 0 0 0 8.017C0 11.867 3.14 15 7 15s7-3.132 7-6.983c0-2.283-1.1-4.382-2.96-5.694zM6 0h2v7H6V0z" fill="#38B44A" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/remove.svg.OTHER'
--- src/maasserver/static/assets/images/icons/remove.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/remove.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><title>remove</title><g fill="gray" fill-rule="evenodd"><path d="M16.36 0L18 1.64 1.64 18 0 16.36z"/><path d="M18 16.36L16.36 18 0 1.64 1.64 0z"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/settings.svg.OTHER'
--- src/maasserver/static/assets/images/icons/settings.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/settings.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96.000001"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M96 0v96H0V0z"/><path style="line-height:normal;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" d="M79.197 66.033c9.916-17.191 3.984-39.246-13.223-49.19-17.207-9.944-39.253-4.057-49.17 13.134C6.89 47.168 12.82 69.222 30.027 79.166c17.207 9.944 39.255 4.058 49.17-13.133zm-3.465-2.002c-8.834 15.316-28.37 20.535-43.708 11.67-15.338-8.863-20.59-28.407-11.756-43.723 8.834-15.316 28.37-20.535 43.708-11.671 15.338 8.864 20.59 28.408 11.756 43.724z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="gray"/><path style="marker:none" d="M54.902 5.582L41.098 7.645v7.097a34.033 33.971 43.146 0 1 13.804.028V5.582zm-28.246 6.244L16.14 20.768l5.181 6.175a34.033 33.971 43.146 0 1 10.58-8.867l-5.244-6.25zm42.631.067L64.08 18.1a34.033 33.971 43.146 0 1 .895.474 34.033 33.971 43.146 0 1 9.673 8.406l5.272-6.28-10.633-8.807zM8.398 34.008l-2.31 13.611 7.947 1.402a34.033 33.971 43.146 0 1 2.387-13.597l-8.024-1.416zm79.118.015l-7.987 1.409a34.033 33.971 43.146 0 1 2.432 13.588L90 47.604l-2.484-13.58zM15.758 58.645L8.67 62.738h-.002l6.98 11.91 7.018-4.05a34.033 33.971 43.146 0 1-6.908-11.953zm64.512.015a34.033 33.971 43.146 0 1-2.805 6.371 34.033 33.971 43.146 0 1-4.059 5.608l7.022 4.054 6.826-12-6.984-4.033zM30.148 76.867l-2.804 7.703 13.004 4.639 2.757-7.58a34.033 33.971 43.146 0 1-12.08-4.195 34.033 33.971 43.146 0 1-.877-.567zm35.733.08a34.033 33.971 43.146 0 1-12.979 4.707l2.782 7.639 12.941-4.807-2.744-7.539z" overflow="visible" fill="gray"/><path style="line-height:normal;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" d="M68.805 60.027c6.61-11.46 2.652-26.178-8.816-32.806-11.47-6.628-26.185-2.7-32.795 8.76-6.61 11.459-2.651 26.18 8.817 32.808 11.47 6.628 26.184 2.697 32.794-8.762zm-3.463-2.001C59.814 67.61 47.61 70.87 38.01 65.324c-9.6-5.548-12.88-17.757-7.351-27.341 5.528-9.585 17.732-12.846 27.332-7.298 9.6 5.547 12.88 17.757 7.351 27.34z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="gray"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/success-mono.svg.OTHER'
--- src/maasserver/static/assets/images/icons/success-mono.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/success-mono.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M8 0C3.59 0 0 3.59 0 8s3.59 8 8 8 8-3.59 8-8-3.59-8-8-8zm3.8 4.924l.7.789L7 11.5 3.385 7.697l.84-.949L7 9.128l4.734-4.148.067-.056z" overflow="visible" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/success.svg.OTHER'
--- src/maasserver/static/assets/images/icons/success.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/success.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g transform="translate(-952 -156.362)"><path style="marker:none" color="#000" overflow="visible" fill="none" d="M952 156.362h16v16h-16z"/><circle r="7.25" cy="164.362" cx="960" style="marker:none" color="#000" overflow="visible" fill="#3eb34f" stroke="#3eb34f" stroke-width="1.5" stroke-dashoffset=".8"/><path style="line-height:125%;-inkscape-font-specification:Ubuntu;text-align:center" d="M963.8 161.286l-.066.057-4.734 4.148-2.776-2.381-.839.948 3.615 3.804 5.5-5.787-.7-.79z" font-weight="400" font-size="15" font-family="Ubuntu" letter-spacing="0" word-spacing="0" text-anchor="middle" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/success_colour_black.svg.OTHER'
--- src/maasserver/static/assets/images/icons/success_colour_black.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/success_colour_black.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g transform="translate(-952 -156.362)"><path style="marker:none" color="#000" overflow="visible" fill="none" d="M952 156.362h16v16h-16z"/><circle r="7.25" cy="164.362" cx="960" style="marker:none" color="#000" overflow="visible" fill="#3eb34f" stroke="#3eb34f" stroke-width="1.5" stroke-dashoffset=".8"/><path style="line-height:125%;-inkscape-font-specification:Ubuntu;text-align:center" d="M963.8 161.286l-.066.057-4.734 4.148-2.776-2.381-.839.948 3.615 3.804 5.5-5.787-.7-.79z" font-weight="400" font-size="15" font-family="Ubuntu" letter-spacing="0" word-spacing="0" text-anchor="middle"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/success_colour_white.svg.OTHER'
--- src/maasserver/static/assets/images/icons/success_colour_white.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/success_colour_white.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g transform="translate(-952 -156.362)"><path style="marker:none" color="#000" overflow="visible" fill="none" d="M952 156.362h16v16h-16z"/><circle r="7.25" cy="164.362" cx="960" style="marker:none" color="#000" overflow="visible" fill="#3eb34f" stroke="#3eb34f" stroke-width="1.5" stroke-dashoffset=".8"/><path style="line-height:125%;-inkscape-font-specification:Ubuntu;text-align:center" d="M963.8 161.286l-.066.057-4.734 4.148-2.776-2.381-.839.948 3.615 3.804 5.5-5.787-.7-.79z" font-weight="400" font-size="15" font-family="Ubuntu" letter-spacing="0" word-spacing="0" text-anchor="middle" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/success_mono.svg.OTHER'
--- src/maasserver/static/assets/images/icons/success_mono.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/success_mono.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M8 0C3.59 0 0 3.59 0 8s3.59 8 8 8 8-3.59 8-8-3.59-8-8-8zm3.8 4.924l.7.789L7 11.5 3.385 7.697l.84-.949L7 9.128l4.734-4.148.067-.056z" overflow="visible" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/sync.svg.OTHER'
--- src/maasserver/static/assets/images/icons/sync.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/sync.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96.000001"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M96 0v96H0V0z"/><path d="M84.93 14.958L67.965 31.934a177.473 177.473 0 0 0 11.842 3.925A211.649 211.649 0 0 0 92 39c-.936-3.985-1.999-8.035-3.187-12.147a206.82 206.82 0 0 0-3.882-11.894zM11.035 81L28 64.024A177.472 177.472 0 0 0 16.158 60.1a211.647 211.647 0 0 0-12.193-3.141c.936 3.985 1.999 8.035 3.187 12.147 1.217 4.136 2.511 8.1 3.882 11.894z" style="marker:none" overflow="visible" fill="gray"/><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" d="M48 8C25.932 8 8 25.932 8 48c0 .652.02 1.3.05 1.945 1.356.336 2.717.686 4.083 1.053A36.54 36.54 0 0 1 12 48c0-19.906 16.094-36 36-36 13.005 0 24.38 6.872 30.705 17.186l2.86-2.862C74.444 15.31 62.076 8 48 8zm35.863 36.969c.084 1 .137 2.009.137 3.031 0 19.906-16.094 36-36 36-13.025 0-24.416-6.892-30.736-17.232l-2.88 2.88C21.512 80.682 33.908 88 48 88c22.068 0 40-17.932 40-40a2 2 0 0 0-.041-.406 40.381 40.381 0 0 0-.057-1.584 211.753 211.753 0 0 1-4.039-1.041z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="gray"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/system-shutdown.svg.OTHER'
--- src/maasserver/static/assets/images/icons/system-shutdown.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/system-shutdown.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96.000001"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M96 0v96H0V0z"/><path d="M46 6l4-1v35h-4z" style="marker:none" overflow="visible" fill="gray"/><path style="line-height:normal;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" d="M30.006 16.798c-14.099 8.144-20.983 24.771-16.77 40.504C17.45 73.034 31.72 83.989 48 83.989s30.55-10.955 34.763-26.687c4.214-15.733-2.669-32.36-16.767-40.504l-2.002 3.463C76.54 27.509 82.65 42.263 78.9 56.266 75.15 70.27 62.488 79.99 48 79.99S20.85 70.27 17.1 56.266c-3.75-14.003 2.357-28.757 14.905-36.005l-2-3.463z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="gray"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/tags.svg.OTHER'
--- src/maasserver/static/assets/images/icons/tags.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/tags.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 15.999999"><path opacity=".212" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M8.691 0L.775 7.918c-1.218 1.218-.913 1.522.305 2.74l2.13 2.131 2.132 2.13c1.218 1.219 1.522 1.524 2.74.306L16 7.309V.914c0-.304-.076-.533-.228-.686C15.619.076 15.39 0 15.086 0zm.418 1.008h5.883V6.89l-7.525 7.523c-.795.839-1.472-.388-2.074-.87a46.125 46.125 0 0 0-1.47-1.468 45.917 45.917 0 0 0-1.468-1.469c-.481-.602-1.708-1.28-.87-2.074L9.11 1.008z" color="#000" overflow="visible" fill="gray"/><path style="marker:none" d="M12.518 2.25a1.25 1.25 0 0 1 .867.365 1.25 1.25 0 0 1 0 1.77 1.25 1.25 0 0 1-1.77 0 1.25 1.25 0 0 1 0-1.77 1.25 1.25 0 0 1 .903-.365z" color="#000" overflow="visible" fill="gray"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/tick.svg.OTHER'
--- src/maasserver/static/assets/images/icons/tick.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/tick.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="22" viewBox="0 0 22 16"><title>textfield-saved</title><path d="M20.04.343l-.154.136-11.138 9.756-6.53-5.601L.246 6.866l8.505 8.948L21.687 2.2 20.04.343z" fill="#38B44A" fill-rule="evenodd"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/tooltip.svg.OTHER'
--- src/maasserver/static/assets/images/icons/tooltip.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/tooltip.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 15.999999"><path style="marker:none" color="#000" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M1.066 0C.476 0 0 .475 0 1.066v13.868C0 15.524.475 16 1.066 16h13.868c.59 0 1.066-.475 1.066-1.066V1.066C16 .476 15.525 0 14.934 0H1.066zM1 1h14v14H1V1z" color="#000" overflow="visible" fill="gray"/><path style="line-height:125%;-inkscape-font-specification:'Ubuntu Medium';text-align:center" d="M8.154 2.676c-.497 0-.985.064-1.463.193-.467.12-.884.283-1.252.492l.506 1.387a4.294 4.294 0 0 1 1-.402c.319-.09.652-.133 1-.133.448 0 .782.11 1 .328.229.209.342.476.342.805 0 .238-.055.457-.164.656-.11.199-.249.393-.418.582-.169.189-.352.377-.55.566a6.377 6.377 0 0 0-.538.612 3.22 3.22 0 0 0-.418.716c-.11.26-.164.553-.164.881 0 .1.006.21.016.328.01.11.023.214.043.313h1.552a1.09 1.09 0 0 1-.015-.18v-.177c0-.299.06-.568.18-.807a3.43 3.43 0 0 1 .476-.67c.19-.219.393-.428.611-.627.22-.209.423-.427.612-.656.189-.229.343-.478.463-.746.129-.269.195-.572.195-.91 0-.279-.045-.567-.135-.866a2.095 2.095 0 0 0-.478-.82c-.229-.249-.536-.452-.924-.611-.388-.17-.88-.254-1.477-.254zM8 11.006a.995.995 0 0 0-.713.287.942.942 0 0 0-.287.713c0 .292.095.53.287.713.2.183.438.275.713.275a.992.992 0 0 0 .713-.275.942.942 0 0 0 .287-.713.943.943 0 0 0-.287-.713.968.968 0 0 0-.713-.287z" font-weight="500" font-family="Ubuntu" letter-spacing="0" word-spacing="0" text-anchor="middle" fill="gray"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/unmount.svg.OTHER'
--- src/maasserver/static/assets/images/icons/unmount.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/unmount.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.2333493 4.2333317"><path style="marker:none" color="#000" overflow="visible" opacity=".12" fill="none" d="M4.233 4.233V0H0v4.233z"/><path d="M0 .265v.793h4.233V.265zm3.44.264h.529v.265h-.53zM2.381 2.91v.265h1.852V2.91z" style="marker:none" color="#000" overflow="visible" fill="gray"/></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/warning-mono.svg.OTHER'
--- src/maasserver/static/assets/images/icons/warning-mono.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/warning-mono.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" d="M8.045-.023a.967 1.034 0 0 0-.098.002.967 1.034 0 0 0-.785.513L.154 13.471a.967 1.034 0 0 0 .836 1.552h14.02a.967 1.034 0 0 0 .836-1.552L8.838.492a.967 1.034 0 0 0-.793-.515zM7 5h2v5H7V5zm0 6h2v2H7v-2z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/warning.svg.OTHER'
--- src/maasserver/static/assets/images/icons/warning.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/warning.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>warning</title><g fill="none" fill-rule="evenodd"><path d="M0 0h16v16H0z"/><circle stroke="#F4B457" stroke-width="1.5" cx="8" cy="8" r="7.25"/><path d="M7 4v5h2V4H7zm0 6v2h2v-2H7z" fill="#F4B457"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/warning_colour_black.svg.OTHER'
--- src/maasserver/static/assets/images/icons/warning_colour_black.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/warning_colour_black.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M963.075 207.025h-6.15L960 201.7z" transform="matrix(2.27997 0 0 2.43698 -2180.772 -490.526)" overflow="visible" fill="#e95420" stroke="#e95420" stroke-width=".848" stroke-linejoin="round"/><path style="marker:none" d="M7 5v5h2V5H7zm0 6v2h2v-2H7z" overflow="visible"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/warning_colour_white.svg.OTHER'
--- src/maasserver/static/assets/images/icons/warning_colour_white.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/warning_colour_white.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="marker:none" d="M963.075 207.025h-6.15L960 201.7z" transform="matrix(2.27997 0 0 2.43698 -2180.772 -490.526)" overflow="visible" fill="#e95420" stroke="#e95420" stroke-width=".848" stroke-linejoin="round"/><path style="marker:none" overflow="visible" fill="#fff" d="M7 5h2v5H7zM7 11h2v2H7z"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/assets/images/icons/warning_mono.svg.OTHER'
--- src/maasserver/static/assets/images/icons/warning_mono.svg.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/assets/images/icons/warning_mono.svg.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16.000017 16.000017"><g color="#000"><path style="marker:none" overflow="visible" fill="none" d="M0 0h16v16H0z"/><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" d="M8.045-.023a.967 1.034 0 0 0-.098.002.967 1.034 0 0 0-.785.513L.154 13.471a.967 1.034 0 0 0 .836 1.552h14.02a.967 1.034 0 0 0 .836-1.552L8.838.492a.967 1.034 0 0 0-.793-.515zM7 5h2v5H7V5zm0 6h2v2H7v-2z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#fff"/></g></svg>
\ No newline at end of file

=== added file 'src/maasserver/static/css/build.css'
--- src/maasserver/static/css/build.css	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/css/build.css	2017-04-25 09:34:40 +0000
@@ -0,0 +1,1 @@
+*{font-smoothing:subpixel-antialiased;box-sizing:border-box}button,input[type='button'],input[type='reset'],input[type='submit'],.button--primary,.button--secondary,.button--neutral,.button--inline-neutral,.button--positive,.button--inline-positive,.button--destructive,.button--inline-destructive,.button--base,.button--inline-base{font-smoothing:subpixel-antialiased;font-size:1em;display:inline-block;width:100%;margin:0;padding:11px 24px;text-align:center;text-decoration:none;border:0;border-radius:2px;outline:none;font-weight:300;cursor:pointer}button:hover,input[type='button']:hover,input[type='reset']:hover,input[type='submit']:hover,.button--primary:hover,.button--secondary:hover,.button--neutral:hover,.button--inline-neutral:hover,.button--positive:hover,.button--inline-positive:hover,.button--destructive:hover,.button--inline-destructive:hover,.button--base:hover,.button--inline-base:hover{text-decoration:none}@media only screen and (min-width: 768px){button,input[type='button'],input[type='reset'],input[type='submit'],.button--primary,.button--secondary,.button--neutral,.button--inline-neutral,.button--positive,.button--inline-positive,.button--destructive,.button--inline-destructive,.button--base,.button--inline-base{width:auto}}.clearfix{display:block}.clearfix:after{clear:both;content:'\0020';display:block;height:0;overflow:hidden;visibility:hidden}textarea,input[type='text'],input[type='number'],input[type='search'],input[type='password'],input[type='email'],input[type='url'],input[type='tel'],select{-webkit-appearance:textfield;border-radius:2px;border:1px solid #cdcdcd;box-shadow:inset 0 1px 2px rgba(0,0,0,0.12);font-size:16px;margin:0;outline:none;padding:.6956522em .869565em;vertical-align:baseline;font-weight:300}textarea:active,input[type='text']:active,input[type='number']:active,input[type='search']:active,input[type='password']:active,input[type='email']:active,input[type='url']:active,input[type='tel']:active,select:active,textarea:focus,input[type='text']:focus,input[type='number']:focus,input[type='search']:focus,input[type='password']:focus,input[type='email']:focus,input[type='url']:focus,input[type='tel']:focus,select:focus{border-color:#888;outline:none}textarea::placeholder,input[type='text']::placeholder,input[type='number']::placeholder,input[type='search']::placeholder,input[type='password']::placeholder,input[type='email']::placeholder,input[type='url']::placeholder,input[type='tel']::placeholder,select::placeholder{color:contrast-friendly-search-color(#f7f7f7)}textarea[disabled="disabled"],input[disabled="disabled"][type='text'],input[disabled="disabled"][type='number'],input[disabled="disabled"][type='search'],input[disabled="disabled"][type='password'],input[disabled="disabled"][type='email'],input[disabled="disabled"][type='url'],input[disabled="disabled"][type='tel'],select[disabled="disabled"]{opacity:.5}input[type='checkbox'],input[type='radio']{border-radius:2px;border:1px solid #cdcdcd;box-shadow:inset 0 1px 2px rgba(0,0,0,0.12);height:14px;padding:0;vertical-align:middle;width:14px}.inner-wrapper{margin:0 auto;max-width:1030px}[class*='-col'].last-col,[class*='-col'] [class*='-col'].last-col{margin-right:0}.one-col,.two-col,.three-col,.four-col,.five-col,.six-col,.seven-col,.eight-col,.nine-col,.ten-col,.eleven-col,.twelve-col{clear:none;margin-bottom:20px;margin-right:0;padding:0;display:inline-block;position:relative;width:100%}@media only screen and (min-width: 768px){.one-col,.two-col,.three-col,.four-col,.five-col,.six-col,.seven-col,.eight-col,.nine-col,.ten-col,.eleven-col,.twelve-col{float:left}}.list-ticks,.list{list-style:none;margin-left:0}.list-ticks li,.list li{border-bottom:1px dotted #888;margin-bottom:0;padding:10px 0}.list-ticks li:last-of-type,.list li:last-of-type,.list-ticks .last-item,.list .last-item{border:0;margin-bottom:0;padding-bottom:0}.list-ticks li{background-repeat:no-repeat;background-position:0 1em;padding-left:25px}.box{background:#fff;border:1px solid #cdcdcd;padding:1.25em 20px}@media only screen and (min-width: 768px){.equal-height,.equal-height--vertical-divider{display:flex;flex-wrap:wrap;flex-direction:row;width:100%}.equal-height .equal-height__item,.equal-height--vertical-divider .equal-height__item{display:flex;flex:auto;flex-direction:column}}button,input[type='button'],input[type='reset'],input[type='submit'],.button--primary,.button--secondary,.button--neutral,.button--inline-neutral,.button--positive,.button--inline-positive,.button--destructive,.button--inline-destructive,.button--base,.button--inline-base{font-size:1em;box-sizing:border-box;width:100%;margin:0;padding:11px 24px;text-align:center;text-decoration:none;border-radius:2px;outline:none;font-weight:300;cursor:pointer;line-height:1em}button:disabled,input[type='button']:disabled,input[type='reset']:disabled,input[type='submit']:disabled,.button--primary:disabled,.button--secondary:disabled,.button--neutral:disabled,.button--inline-neutral:disabled,.button--positive:disabled,.button--inline-positive:disabled,.button--destructive:disabled,.button--inline-destructive:disabled,.button--base:disabled,.button--inline-base:disabled,button.button--disabled,input.button--disabled[type='button'],input.button--disabled[type='reset'],input.button--disabled[type='submit'],.button--disabled.button--primary,.button--disabled.button--secondary,.button--disabled.button--neutral,.button--disabled.button--inline-neutral,.button--disabled.button--positive,.button--disabled.button--inline-positive,.button--disabled.button--destructive,.button--disabled.button--inline-destructive,.button--disabled.button--base,.button--disabled.button--inline-base{opacity:.5;cursor:default}button,input[type='button'],input[type='reset'],input[type='submit'],.button--primary,.button--secondary,.button--neutral,.button--inline-neutral,.button--positive,.button--inline-positive,.button--destructive,.button--inline-destructive,.button--base,.button--inline-base{line-height:20px;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;user-select:none;padding:8px 14px;height:36px;box-sizing:border-box}button[disabled],input[disabled][type='button'],input[disabled][type='reset'],input[disabled][type='submit'],[disabled].button--primary,[disabled].button--secondary,[disabled].button--neutral,[disabled].button--inline-neutral,[disabled].button--positive,[disabled].button--inline-positive,[disabled].button--destructive,[disabled].button--inline-destructive,[disabled].button--base,[disabled].button--inline-base,button.button--disabled,input.button--disabled[type='button'],input.button--disabled[type='reset'],input.button--disabled[type='submit'],.button--disabled.button--primary,.button--disabled.button--secondary,.button--disabled.button--neutral,.button--disabled.button--inline-neutral,.button--disabled.button--positive,.button--disabled.button--inline-positive,.button--disabled.button--destructive,.button--disabled.button--inline-destructive,.button--disabled.button--base,.button--disabled.button--inline-base{pointer-events:none;opacity:.5}button.button--inline,input.button--inline[type='button'],input.button--inline[type='reset'],input.button--inline[type='submit'],.button--inline.button--primary,.button--inline.button--secondary,.button--inline.button--neutral,.button--inline.button--inline-neutral,.button--inline.button--positive,.button--inline.button--inline-positive,.button--inline.button--destructive,.button--inline.button--inline-destructive,.button--inline.button--base,.button--inline.button--inline-base{display:inline-block;width:auto}html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,ol,ul,li,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;margin:0;padding:0;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,nav,section{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none}[hidden]{display:none}html{font-size:100%;overflow-y:scroll;text-size-adjust:100%}blockquote,q{quotes:none}legend{border:0}figure{margin:0}abbr,acronym{cursor:help}.link-arrow:after{content:'\0000a0›'}nav ul li h2 a:after{content:'\0000a0›'}nav ul li a:after,.carousel ul li a:after,ul li p a:after{content:''}svg:not(:root){overflow:hidden}img{border:0;height:auto;max-width:100%}img .left{margin-right:20px}img .right{margin-left:20px}.middle img{vertical-align:middle;margin-top:4em}ins{background:#fffbeb;text-decoration:none}.left{float:left}.right{float:right}.no-border{border:0}.link-top{font-size:.875em;clear:both;margin-bottom:40px;margin-top:-40px}.link-top a{background:#fff;margin-right:10px;margin-top:-35px;padding:5px;float:right}.caps{text-transform:uppercase}.touch-border,.touch-bottom{float:left}@media only screen and (min-width: 768px){.touch-border,.touch-bottom{margin-bottom:-20px}}@media only screen and (min-width: 1440px){.touch-border,.touch-bottom{margin-bottom:-40px}}.accessibility-aid,.off-left{position:absolute;left:-999em}.external{background-size:.7em .7em;padding-right:.9em;background-image:url("https://assets.ubuntu.com/v1/f24a8aa0-external-link-orange.svg");background-position:100% top;background-repeat:no-repeat}.no-svg .external{background-image:url("https://assets.ubuntu.com/v1/f24a8aa0-external-link-orange.svg")}.text-center,.align-center{text-align:center}.no-margin-bottom{margin-bottom:0}.no-padding-bottom{padding-bottom:0}.pull-bottom-right{float:right;margin-right:-10px}@media only screen and (min-width: 768px){.pull-bottom-right{margin-right:-40px;margin-bottom:-40px}}@media only screen and (min-width: 1440px){.pull-bottom-right{margin-right:-40px;margin-bottom:-60px}}.pull-bottom-left{float:left;margin-left:-10px}@media only screen and (min-width: 768px){.pull-bottom-left{margin-left:-40px;margin-bottom:-40px}}@media only screen and (min-width: 1440px){.pull-bottom-left{margin-left:-40px;margin-bottom:-60px}}@media only screen and (max-width: 767px){.priority-0,.not-for-small{display:none}}@media only screen and (min-width: 768px){.for-mobile,.for-small{display:none}}.video-container{position:relative;padding-bottom:56.25%;padding-top:30px;height:0;overflow:hidden}.video-container iframe{position:absolute;top:0;left:0;width:100%;height:100%}.video-container+.video-title{margin-top:20px}.pull-right{float:right;margin-right:-40px}@media only screen and (max-width: 768px){.pull-right{margin-bottom:20px}}.pull-left{margin-left:-40px}.for-tablet,.for-medium{display:none}@media only screen and (min-width: 768px){.for-tablet,.for-medium{display:block}}@media only screen and (min-width: 768px) and (max-width: 1440px){.med-six-col .three-col{width:48.93617%}.med-six-col .three-col:nth-of-type(2n){margin-right:0}}blockquote{margin:0}blockquote>p{font-size:1em;margin:0 0 .4em}blockquote small{font-size:.8125em;line-height:1.4}.pull-quote{text-indent:0}.pull-quote p{font-size:1.5em;line-height:1.3;margin-left:.4em;padding-left:10px;padding-right:10px;text-indent:-.4em}.pull-quote p span{color:#f7f7f7;font-weight:bold;left:-5px;line-height:0;position:relative}.pull-quote p span:last-of-type{left:5px}.pull-quote p cite{display:block;font-size:.75em;font-weight:300;margin:10px 0 0;text-indent:0}@media only screen and (min-width: 768px){.pull-quote p{padding-left:0;padding-right:0;text-indent:-.7em}.pull-quote p span{top:5px;font-size:1.391304348em}.pull-quote p cite{margin-left:0;text-indent:0}}@media only screen and (min-width: 1440px){.pull-quote p span{top:10px}}.row-quote{border-radius:0}.row-quote blockquote{border-radius:4px;margin:0;padding:0}.row-quote blockquote p{color:#333;line-height:1.3;margin-bottom:.75em;padding-left:10px;padding-right:10px;text-indent:0}.row-quote blockquote span{color:#f7f7f7;font-weight:bold;left:-5px;line-height:0;position:relative}.row-quote blockquote span+span{left:5px}.row-quote blockquote cite{color:#333;font-size:.75em;font-style:normal;margin-bottom:0;text-indent:0}@media only screen and (min-width: 768px){.row-quote{text-indent:-.4em}.row-quote blockquote{text-indent:-7px}.row-quote blockquote p{font-size:1.5em;padding-left:0;padding-right:0;text-indent:-.4em}.row-quote blockquote span{top:5px;font-size:1.391304348em}.row-quote blockquote cite{margin-left:0;text-indent:0}}@media only screen and (min-width: 1440px){.row-quote blockquote{padding:0 80px 20px;text-indent:-10px}.row-quote blockquote p span{top:10px}}button,input[type='button'],input[type='reset'],input[type='submit'],.button--primary{color:#fff;background-color:#dd4814}button:hover,input[type='button']:hover,input[type='reset']:hover,input[type='submit']:hover,.button--primary:hover{background-color:#c03f11}.button--secondary{color:#dd4814;background-color:#fff;border:1px solid #cdcdcd}.button--secondary:hover{background-color:#efefef}@media only screen and (min-width: 620px){.nav-secondary{border:1px solid #d2d2d2;border-top:0}}.nav-secondary .breadcrumb{margin-bottom:0;margin-left:0;padding-top:2px;padding-bottom:3px}@media only screen and (min-width: 620px){.nav-secondary .breadcrumb{float:left;margin-left:4px}}.nav-secondary .breadcrumb li{color:#fff;display:inline-block;margin:0;width:100%}@media only screen and (min-width: 620px){.nav-secondary .breadcrumb li{display:inline-block;width:auto}}.nav-secondary .breadcrumb li:first-of-type{border-bottom:1px solid #d2d2d2}@media only screen and (min-width: 620px){.nav-secondary .breadcrumb li:first-of-type{border-bottom:0}}.nav-secondary .breadcrumb li a{color:#888;font-size:1em;display:inline-block;width:100%;margin-right:0;padding:8px 10px;text-decoration:none}@media only screen and (min-width: 620px){.nav-secondary .breadcrumb li a{font-size:.875em}}@media only screen and (min-width: 620px){.nav-secondary .breadcrumb li .breadcrumb-link,.nav-secondary .breadcrumb li .breadcrumb-link--second-level,.nav-secondary .breadcrumb li .active{display:inline-block;float:none;width:auto}}.nav-secondary .breadcrumb li .breadcrumb-link:after,.nav-secondary .breadcrumb li .breadcrumb-link--second-level:after{content:'\203A';display:inline-block;height:5px;margin-left:8px;position:absolute;width:5px}.nav-secondary .second-level-nav,.nav-secondary .third-level-nav{display:none;overflow:hidden;width:100%;margin:0;padding-top:10px;padding-bottom:10px;border-bottom:1px solid #d2d2d2}@media only screen and (min-width: 620px){.nav-secondary .second-level-nav,.nav-secondary .third-level-nav{display:inline;float:none;margin-bottom:0;padding:0;width:auto;border-bottom:0}}.nav-secondary .second-level-nav li,.nav-secondary .third-level-nav li{margin:0}@media only screen and (min-width: 620px){.nav-secondary .second-level-nav li,.nav-secondary .third-level-nav li{float:none;width:auto}}.nav-secondary .second-level-nav li a,.nav-secondary .third-level-nav li a{font-size:.875em;display:block;width:100%;height:100%;padding:10px;color:#333}@media only screen and (max-width: 620px){.nav-secondary .second-level-nav li a.active,.nav-secondary .third-level-nav li a.active{font-weight:500}}@media only screen and (min-width: 620px){.nav-secondary .second-level-nav li a,.nav-secondary .third-level-nav li a{padding:8px 10px 0}.nav-secondary .second-level-nav li a.active,.nav-secondary .third-level-nav li a.active{color:#f7f7f7}}@media only screen and (min-width: 620px){.nav-secondary .second-level-nav li{width:auto}.nav-secondary .second-level-nav li .active,.nav-secondary .second-level-nav li .breadcrumb-link--second-level{color:#888}.nav-secondary .second-level-nav li .third-level-nav li a{color:#333}.nav-secondary .second-level-nav li .third-level-nav li a:hover{color:#f7f7f7}.nav-secondary .second-level-nav li .third-level-nav li .active{color:#f7f7f7;float:none}.nav-secondary .second-level-nav li .third-level-nav li .active:after{content:''}}.third-level-nav li a:hover{color:#f7f7f7}.third-level-nav li .active{color:#f7f7f7;float:none}@media only screen and (max-width: 619px){#breadcrumbs:hover .second-level-nav,#breadcrumbs:hover .third-level-nav,#breadcrumbs:hover .active{border:0;display:block;overflow:visible;float:left;width:100%;position:relative;clear:both}#breadcrumbs:hover li{border:0;float:left}#breadcrumbs:hover .second-level-nav{border-top:1px solid #d2d2d2}#breadcrumbs:hover .second-level-nav li{float:left}#breadcrumbs:hover .third-level-nav{border-bottom:1px solid #d2d2d2;padding-top:0}#breadcrumbs:hover .third-level-nav li{width:50%;display:block;padding-left:10px}}label{cursor:pointer;display:block;margin-bottom:4px}label.has-error{color:#df382c}label.has-warning{color:#eca918}label.has-success{color:#38b44a}label.has-information{color:#19b6ee}input[type='reset']{display:none}input[type='search']{-webkit-appearance:none;border-radius:0}input[type='checkbox']+label,input[type='radio']+label{display:inline;margin-left:5px;vertical-align:middle;width:auto}input.has-error{border:1px solid #df382c}input.has-warning{border:1px solid #eca918}input.has-success{border:1px solid #38b44a}input.has-information{border:1px solid #19b6ee}form ul{margin-left:0;list-style:none}textarea{overflow:auto;vertical-align:top}textarea[readonly='readonly']{color:#888;cursor:default}textarea[readonly='readonly']:active,textarea[readonly='readonly']:focus{border-color:#888;outline:none}fieldset{background-color:#f7f7f7;background-position:-15px -15px;background-repeat:no-repeat;border-radius:4px;border:0;margin-bottom:8px;padding:15px 20px}@media only screen and (min-width: 1440px){fieldset{padding:15px 20px}}fieldset h3{border-bottom:1px dotted #cdcdcd;margin-bottom:9px;padding-bottom:10px}form input,form select,form textarea{width:100%}@media only screen and (min-width: 768px){.one-col{float:left;width:6.40351%;margin-right:2.10526%}.one-col .one-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.two-col{float:left;width:14.91228%;margin-right:2.10526%}.two-col .one-col{float:left;width:43.81443%;margin-right:12.37113%}.two-col .two-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.three-col{float:left;width:23.42105%;margin-right:2.10526%}.three-col .one-col{float:left;width:27.83505%;margin-right:8.24742%}.three-col .two-col{float:left;width:63.91753%;margin-right:8.24742%}.three-col .three-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.four-col{float:left;width:31.92982%;margin-right:2.10526%}.four-col .one-col{float:left;width:20.36082%;margin-right:6.18557%}.four-col .two-col{float:left;width:46.90722%;margin-right:6.18557%}.four-col .three-col{float:left;width:73.45361%;margin-right:6.18557%}.four-col .four-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.five-col{float:left;width:40.4386%;margin-right:2.10526%}.five-col .one-col{float:left;width:16.04124%;margin-right:4.94845%}.five-col .two-col{float:left;width:37.03093%;margin-right:4.94845%}.five-col .three-col{float:left;width:58.02062%;margin-right:4.94845%}.five-col .four-col{float:left;width:79.01031%;margin-right:4.94845%}.five-col .five-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.six-col{float:left;width:48.94737%;margin-right:2.10526%}.six-col .one-col{float:left;width:13.23024%;margin-right:4.12371%}.six-col .two-col{float:left;width:30.58419%;margin-right:4.12371%}.six-col .three-col{float:left;width:47.93814%;margin-right:4.12371%}.six-col .four-col{float:left;width:65.2921%;margin-right:4.12371%}.six-col .five-col{float:left;width:82.64605%;margin-right:4.12371%}.six-col .six-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.seven-col{float:left;width:57.45614%;margin-right:2.10526%}.seven-col .one-col{float:left;width:11.25605%;margin-right:3.53461%}.seven-col .two-col{float:left;width:26.04671%;margin-right:3.53461%}.seven-col .three-col{float:left;width:40.83737%;margin-right:3.53461%}.seven-col .four-col{float:left;width:55.62802%;margin-right:3.53461%}.seven-col .five-col{float:left;width:70.41868%;margin-right:3.53461%}.seven-col .six-col{float:left;width:85.20934%;margin-right:3.53461%}.seven-col .seven-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.eight-col{float:left;width:65.96491%;margin-right:2.10526%}.eight-col .one-col{float:left;width:9.79381%;margin-right:3.09278%}.eight-col .two-col{float:left;width:22.68041%;margin-right:3.09278%}.eight-col .three-col{float:left;width:35.56701%;margin-right:3.09278%}.eight-col .four-col{float:left;width:48.45361%;margin-right:3.09278%}.eight-col .five-col{float:left;width:61.34021%;margin-right:3.09278%}.eight-col .six-col{float:left;width:74.2268%;margin-right:3.09278%}.eight-col .seven-col{float:left;width:87.1134%;margin-right:3.09278%}.eight-col .eight-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.nine-col{float:left;width:74.47368%;margin-right:2.10526%}.nine-col .one-col{float:left;width:8.66743%;margin-right:2.74914%}.nine-col .two-col{float:left;width:20.084%;margin-right:2.74914%}.nine-col .three-col{float:left;width:31.50057%;margin-right:2.74914%}.nine-col .four-col{float:left;width:42.91714%;margin-right:2.74914%}.nine-col .five-col{float:left;width:54.33372%;margin-right:2.74914%}.nine-col .six-col{float:left;width:65.75029%;margin-right:2.74914%}.nine-col .seven-col{float:left;width:77.16686%;margin-right:2.74914%}.nine-col .eight-col{float:left;width:88.58343%;margin-right:2.74914%}.nine-col .nine-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.ten-col{float:left;width:82.98246%;margin-right:2.10526%}.ten-col .one-col{float:left;width:7.7732%;margin-right:2.47423%}.ten-col .two-col{float:left;width:18.02062%;margin-right:2.47423%}.ten-col .three-col{float:left;width:28.26804%;margin-right:2.47423%}.ten-col .four-col{float:left;width:38.51546%;margin-right:2.47423%}.ten-col .five-col{float:left;width:48.76289%;margin-right:2.47423%}.ten-col .six-col{float:left;width:59.01031%;margin-right:2.47423%}.ten-col .seven-col{float:left;width:69.25773%;margin-right:2.47423%}.ten-col .eight-col{float:left;width:79.50515%;margin-right:2.47423%}.ten-col .nine-col{float:left;width:89.75258%;margin-right:2.47423%}.ten-col .ten-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.eleven-col{float:left;width:91.49123%;margin-right:2.10526%}.eleven-col .one-col{float:left;width:7.04609%;margin-right:2.2493%}.eleven-col .two-col{float:left;width:16.34148%;margin-right:2.2493%}.eleven-col .three-col{float:left;width:25.63687%;margin-right:2.2493%}.eleven-col .four-col{float:left;width:34.93227%;margin-right:2.2493%}.eleven-col .five-col{float:left;width:44.22766%;margin-right:2.2493%}.eleven-col .six-col{float:left;width:53.52305%;margin-right:2.2493%}.eleven-col .seven-col{float:left;width:62.81844%;margin-right:2.2493%}.eleven-col .eight-col{float:left;width:72.11383%;margin-right:2.2493%}.eleven-col .nine-col{float:left;width:81.40922%;margin-right:2.2493%}.eleven-col .ten-col{float:left;width:90.70461%;margin-right:2.2493%}.eleven-col .eleven-col{width:100%;margin-right:0}}@media only screen and (min-width: 768px){.prepend-one{margin-left:8.50877%}.prepend-two{margin-left:17.01754%}.prepend-three{margin-left:25.52632%}.prepend-four{margin-left:34.03509%}.prepend-five{margin-left:42.54386%}.prepend-six{margin-left:51.05263%}.prepend-seven{margin-left:59.5614%}.prepend-eight{margin-left:68.07018%}.prepend-nine{margin-left:76.57895%}.prepend-ten{margin-left:85.08772%}.prepend-eleven{margin-left:93.59649%}}@media only screen and (min-width: 768px){.append-one{margin-right:8.50877%}.append-two{margin-right:17.01754%}.append-three{margin-right:25.52632%}.append-four{margin-right:34.03509%}.append-five{margin-right:42.54386%}.append-six{margin-right:51.05263%}.append-seven{margin-right:59.5614%}.append-eight{margin-right:68.07018%}.append-nine{margin-right:76.57895%}.append-ten{margin-right:85.08772%}.append-eleven{margin-right:93.59649%}}@media only screen and (min-width: 768px){.push-one{float:left;position:relative;margin:0 -8.50877% 0 8.50877%}.push-two{float:left;position:relative;margin:0 -19.12281% 0 19.12281%}.push-three{float:left;position:relative;margin:0 -27.63158% 0 27.63158%}.push-four{float:left;position:relative;margin:0 -36.14035% 0 36.14035%}.push-five{float:left;position:relative;margin:0 -44.64912% 0 44.64912%}.push-six{float:left;position:relative;margin:0 -53.15789% 0 53.15789%}.push-seven{float:left;position:relative;margin:0 -61.66667% 0 61.66667%}.push-eight{float:left;position:relative;margin:0 -70.17544% 0 70.17544%}.push-nine{float:left;position:relative;margin:0 -78.68421% 0 78.68421%}.push-ten{float:left;position:relative;margin:0 -87.19298% 0 87.19298%}.push-eleven{float:left;position:relative;margin:0 -95.70175% 0 95.70175%}}@media only screen and (min-width: 768px){.pull-one{float:left;position:relative;margin-left:-6.40351%}.pull-two{float:left;position:relative;margin-left:17.01754%}.pull-three{float:left;position:relative;margin-left:25.52632%}.pull-four{float:left;position:relative;margin-left:34.03509%}.pull-five{float:left;position:relative;margin-left:42.54386%}.pull-six{float:left;position:relative;margin-left:51.05263%}.pull-seven{float:left;position:relative;margin-left:59.5614%}.pull-eight{float:left;position:relative;margin-left:68.07018%}.pull-nine{float:left;position:relative;margin-left:76.57895%}.pull-ten{float:left;position:relative;margin-left:85.08772%}.pull-eleven{float:left;position:relative;margin-left:93.59649%}}.banner{background:#f7f7f7;border-bottom:0;border-top:0;box-shadow:inset 0 -1px 0 #ccc;display:block;min-width:100%;position:relative;width:auto;z-index:2}@media only screen and (min-width: 620px){.banner{border-bottom:1px solid #ccc;box-shadow:none}}.banner .logo{position:relative;display:table;float:left;overflow:hidden;height:48px;margin:0 10px;border-left:0}@media only screen and (min-width: 620px){.banner .logo{margin:0 15px}}.banner .logo a{display:table-cell;height:100%;vertical-align:middle;color:#fff}.banner .logo a span{display:inline-block}.banner h2{font-size:1.563em;position:relative;top:14px;left:4px;display:block;margin-bottom:0;text-transform:lowercase}.banner h2 a,.banner h2 a:link,.banner h2 a:visited{float:left;text-decoration:none;color:#fff}.banner .nav-primary{overflow:hidden;margin:0 auto;border:0}@media only screen and (min-width: 620px){.banner .nav-primary{max-width:1440px}}.banner .nav-primary span{display:none}.banner .nav-primary ul{display:none;float:left;width:100%;margin:0;padding:0;border-top:1px solid #ccc;box-shadow:inset 0 -1px 0 #ccc;background-color:#ebebeb}@media only screen and (min-width: 620px){.banner .nav-primary ul{position:static;display:block;width:auto;border-top:0;background-color:transparent;box-shadow:none}}.banner .nav-primary ul li{float:left;width:50%;margin:0;border-right:1px solid #ccc;border-bottom:1px solid #ccc;background:transparent}@media only screen and (min-width: 620px){.banner .nav-primary ul li{width:auto;border-right:0;border-bottom:0;border-left:1px solid #e3e3e3}.banner .nav-primary ul li:last-child{border-right:1px solid #e3e3e3}.banner .nav-primary ul li:last-child a{border-right:0}}@media only screen and (max-width: 620px){.banner .nav-primary ul li:nth-child(2n+2){border-right:0}}.banner .nav-primary ul li a,.banner .nav-primary ul li a:link,.banner .nav-primary ul li a:visited{font-size:1em;font-weight:300;position:relative;display:block;margin-bottom:0;padding:8px 10px;text-align:left;text-decoration:none;background-color:#ebebeb;font-smoothing:subpixel-antialiased;color:#333}@media only screen and (min-width: 620px){.banner .nav-primary ul li a,.banner .nav-primary ul li a:link,.banner .nav-primary ul li a:visited{font-size:.875em;padding:14px 14px 13px;text-align:center;border-left:1px solid #fff;background-color:transparent;color:#fff}}.banner .nav-primary ul li a:hover,.banner .nav-primary ul li a:link:hover,.banner .nav-primary ul li a:visited:hover{background:#f2f2f2}@media only screen and (min-width: 620px){.banner .nav-primary ul li a:hover,.banner .nav-primary ul li a:link:hover,.banner .nav-primary ul li a:visited:hover{background-color:#fff}}.banner .nav-primary ul li a.active,.banner .nav-primary ul li a:link.active,.banner .nav-primary ul li a:visited.active{background-color:#ddd}@media only screen and (min-width: 620px){.banner .nav-primary ul li a.active,.banner .nav-primary ul li a:link.active,.banner .nav-primary ul li a:visited.active{background-color:#e3e3e3;border-left:0}}.banner .nav-toggle{position:absolute;top:0;right:0;display:block;width:48px;height:48px;cursor:pointer;text-indent:-99999px;background-image:url("https://assets.ubuntu.com/v1/12387180-navigation-menu-plain.svg");background-repeat:no-repeat;background-position:center center;background-size:25px auto}@media only screen and (min-width: 620px){.banner .nav-toggle{display:none}}.banner .nav-toggle .nav-toggle__link{width:48px;height:48px}.banner .nav-toggle .nav-toggle__link.open{display:block}.banner .nav-toggle .nav-toggle__link.close{display:none}@media only screen and (max-width: 620px){.banner #nav:hover ul{display:block}.banner #nav:hover ul ul{display:none}.banner #nav:hover .nav-toggle .nav-toggle__link.open{display:none}.banner #nav:hover .nav-toggle .nav-toggle__link.close{display:block}}ol,ul{margin-left:20px;margin-bottom:20px}ol ol,ul ul,ol ul,ul ol{margin-bottom:0}nav ul,nav ol{list-style:none;list-style-image:none}li{font-size:1em;line-height:1.5;margin:0 0 .4em;padding:0}.list-ticks li{background-image:url("data:image/svg+xml;utf8, <svg xmlns='http://www.w3.org/2000/svg' width='14' height='14' viewBox='0 0 14 14'><circle fill='%23c4c4c4' cx='7' cy='7' r='7'/><path fill='%23fff' d='M6.1 10.813L2.41 8.105l1.184-1.613L5.9 8.187l4.393-4.394 1.414 1.414z' /></svg>")}.no-bullets{list-style:none;margin-left:0}.combined-list ul,.combined-list div{margin-bottom:0}.combined-list .last-item{border-bottom:1px dotted #888;padding-bottom:10px}.combined-list .last-col{margin-bottom:20px}.combined-list .last-col .last-item{border-bottom:0;padding-bottom:0}@media only screen and (min-width: 768px){.combined-list ul,.combined-list div{margin-bottom:20px}.combined-list .last-item{border-bottom:0;padding-bottom:0}}.inline-list{margin-left:0}.inline-list li{display:inline;list-style:none;margin-right:20px}.inline-list .last-item{margin-right:0}.list-step{list-style:none;margin-left:60px}@media only screen and (max-width: 1440px){.list-step__item:first-child{margin-top:10px}}@media only screen and (min-width: 1440px){.list-step__title{margin-bottom:0}}.list-step__bullet{box-shadow:0 1px 3px 1px rgba(51,51,51,0.2);background:#fff;border-radius:50%;padding:.3em .68em;display:inline-block;color:#f7f7f7;margin-right:.34375em;margin-bottom:.625em;margin-left:-60px}@media only screen and (max-width: 1440px){.list-step__bullet{position:absolute;top:-5px}}.row{border-bottom:1px dotted #888;clear:both;padding:20px 10px 0;position:relative}.row br{display:none}.row.no-padding-bottom{padding-bottom:0}.row::after{clear:both;content:'.';display:block;height:0;visibility:hidden}.row--light{background:#fff}.row--dark{background:#333;color:#fff}.row.row-grey,.row.row--grey{background:#f7f7f7;border:0;margin-top:-1px}.no-border{border:0}.row-hero{margin-top:20px;padding-top:0}.strip{width:100%;display:block}.strip-inner-wrapper{max-width:1440px;margin:auto}@media only screen and (min-width: 768px){.row-hero{margin-top:40px}.row{border-radius:0;margin:0;padding:40px 20px 20px}.row-grey{margin-top:-1px}}@media only screen and (min-width: 769px){.row br{display:block}}@media only screen and (min-width: 1440px){.row br{display:block}.row{padding:60px 20px 40px}.no-border{border:0}}.header-search [type="search"],.header-search [type="text"],.search-form [type="search"],.search-form [type="text"]{-webkit-appearance:none;background-color:#dedede;box-shadow:none;color:#333;display:block;float:left;font-size:1em;margin-bottom:0;padding:12px 10px;transition:all .5s ease-out;width:100%}.header-search .svg-search-handle,.search-form .svg-search-handle{fill:#333}.header-search .svg-search-frame,.search-form .svg-search-frame{stroke:#333}.header-search placeholder,.search-form placeholder{color:#333;opacity:1}.header-search input:placeholder,.search-form input:placeholder{color:#333;opacity:1}.header-search ::placeholder,.search-form ::placeholder{color:#333;opacity:1}.header-search [type="search"]:focus,.search-form [type="search"]:focus{background-color:#d3d3d3;border-color:#b3b3b3}.header-search [type=submit],.search-form [type=submit]{background:none;display:block;float:left;line-height:0;margin-left:-40px;overflow:visible;padding:3px 2px;width:auto}.header-search [type=submit]:hover,.search-form [type=submit]:hover{background:none}.header-search [type=submit] img,.search-form [type=submit] img{height:28px;width:28px;margin-top:2px}.banner .search-toggle{background-image:url("data:image/svg+xml;utf8, <svg xmlns='http://www.w3.org/2000/svg' width='28' height='28' viewBox='0 0 90 90'><g color='%23333'><path fill='none' stroke-width='4' overflow='visible' enable-background='accumulate' d='M0 0h90v90H0z'/><path d='M69 36.5a33 33.5 0 1 1-66 0 33 33.5 0 1 1 66 0z' transform='matrix(.636 0 0 .627 16.114 16.12)' fill='none' stroke='%23333' stroke-width='9.5' overflow='visible' enable-background='accumulate'/><path d='M55.77 52.92L52.94 55.75l14 14 2.83-2.83-14-14z' font-size='xx-small' fill='%23333' stroke-width='6' overflow='visible' enable-background='accumulate' font-family='Sans' class='s0'/><path d='M60.97 57.03c-1.55-3.04 1.02-3.63 2.46-0.58 1.44-0.21 3.21 4.29l9.19 9.2c2.68 2.85 3.26 2.46 5.64 2.38-2.38 2.77-2.79-0.08-5.65l-9.19-9.2c-0.73-0.75-1.78-1.19-2.83-1.19z' font-size='xx-small' fill='%23333' stroke-width='11.8' overflow='visible' enable-background='accumulate' font-family='Sans' class='s0'/></g></svg>");background-position:center center;background-repeat:no-repeat;background-size:20px 20px;display:block;height:48px;outline:none;overflow:hidden;position:absolute;right:0;text-indent:-999em;top:0;width:24px}.banner .search-toggle .search-toggle__link{width:48px;height:48px}.banner .search-toggle .search-toggle__link.open{display:block}.banner .search-toggle .search-toggle__link.close{display:none}#site-search:hover form{display:block}#site-search:hover .search-toggle .search-toggle__link.open{display:none}#site-search:hover .search-toggle .search-toggle__link.close{display:block}.header-search,.search-form{background:#f7f7f7;border:0;display:none;float:left;position:relative;margin:0;width:100%;z-index:3}.search-form.active,.header-search.active,.header-search.open{display:block}.search-form div,.header-search div{box-shadow:inset 0 -4px 4px -4px rgba(0,0,0,0.3),inset 0 5px 5px -5px rgba(0,0,0,0.3);background:#fff;margin:10px;position:relative;z-index:1}.search-form form [type="search"],.header-search form [type="search"]{background:#fff;border:0;box-shadow:0 2px 2px rgba(0,0,0,0.3) inset,0 -1px 3px rgba(0,0,0,0.2) inset,0 2px 0 rgba(255,255,255,0.4);color:#333;display:block;float:left;font-size:1em;height:auto;margin:0;padding:8px 10px;width:100%}.yes-js .header-inner .search-form,.yes-js .header-inner .header-search{display:none}.yes-js .header-inner .search-form form,.yes-js .header-inner .header-search form{margin-left:0;margin-right:0;overflow:hidden;padding:10px;position:relative;top:0;width:100%;z-index:999}@media only screen and (max-width: 620px){.banner .search-toggle{right:0}.no-svg .search-toggle,.opera-mini .search-toggle{background-image:url("https://assets.ubuntu.com/v1/75d8151d-search-white.png")}}@media only screen and (min-width: 620px){.banner .search-toggle{display:none}}@media only screen and (min-width: 620px){.search-form,.header-search{background:none;border-right:0 none;float:right;margin-bottom:0;max-width:220px;overflow:hidden;padding:7px 0 5px 14px}.search-form form [type="text"],.search-form form [type="search"],.header-search form [type="text"],.header-search form [type="search"]{box-shadow:0 2px 4px rgba(0,0,0,0.4) inset;box-sizing:content-box;background-color:#dedede;border:0 solid #d8d8d8;border-width:0 0 1px;color:#333;font-size:.813em;height:24px;margin-bottom:0;padding:.5em 2.5em .5em .5em;transition:all .5s ease 0s;width:86px}.search-form form [type="text"]:focus,.search-form form [type="search"]:focus,.header-search form [type="text"]:focus,.header-search form [type="search"]:focus{background-color:#d3d3d3;border-color:#c4c4c4}.search-form .svg-search-handle,.header-search .svg-search-handle{fill:#333}.search-form .svg-search-frame,.header-search .svg-search-frame{stroke:#333}.search-form placeholder,.header-search placeholder{color:#333}.search-form input:placeholder,.header-search input:placeholder{color:#333}.search-form ::placeholder,.header-search ::placeholder{color:#333}}@media only screen and (min-width: 620px){.header-search .svg-search-handle,.search-form .svg-search-handle{fill:#333}.header-search .svg-search-frame,.search-form .svg-search-frame{stroke:#333}.header-search placeholder,.search-form placeholder{color:#333}.header-search input:placeholder,.search-form input:placeholder{color:#333}.header-search ::placeholder,.search-form ::placeholder{color:#333}}@media only screen and (max-width: 620px){.banner .nav-primary .header-search{position:relative;top:0;width:100%}.banner .nav-primary .header-search [type="search"]{background-color:#ebebeb;color:#333}.banner .nav-primary .header-search [type="submit"]{background-color:transparent;height:38px;margin-top:0;width:32px}.banner .nav-primary .header-search [type="submit"] img,.banner .nav-primary .header-search [type="submit"] svg{max-width:none}.banner .nav-primary .header-search.open{display:block}.banner .search-toggle{background-image:url("data:image/svg+xml;utf8, <svg xmlns='http://www.w3.org/2000/svg' width='28' height='28' viewBox='0 0 90 90'><g color='%23333'><path fill='none' stroke-width='4' overflow='visible' enable-background='accumulate' d='M0 0h90v90H0z'/><path d='M69 36.5a33 33.5 0 1 1-66 0 33 33.5 0 1 1 66 0z' transform='matrix(.636 0 0 .627 16.114 16.12)' fill='none' stroke='%23333' stroke-width='9.5' overflow='visible' enable-background='accumulate'/><path d='M55.77 52.92L52.94 55.75l14 14 2.83-2.83-14-14z' font-size='xx-small' fill='%23333' stroke-width='6' overflow='visible' enable-background='accumulate' font-family='Sans' class='s0'/><path d='M60.97 57.03c-1.55-3.04 1.02-3.63 2.46-0.58 1.44-0.21 3.21 4.29l9.19 9.2c2.68 2.85 3.26 2.46 5.64 2.38-2.38 2.77-2.79-0.08-5.65l-9.19-9.2c-0.73-0.75-1.78-1.19-2.83-1.19z' font-size='xx-small' fill='%23333' stroke-width='11.8' overflow='visible' enable-background='accumulate' font-family='Sans' class='s0'/></g></svg>");background-position:center center;background-repeat:no-repeat;background-size:25px auto;cursor:pointer;display:block;height:48px;position:absolute;right:0;text-indent:-99999px;width:48px}.no-svg .banner .search-toggle,.opera-mini .banner .search-toggle{background-image:url("https://assets.ubuntu.com/v1/2196e362-search-white.svg")}.opera-mini x:-o-prefocus,.opera-mini .banner .search-toggle{background-size:25px auto}}@media only screen and (min-width: 620px){.search-form,.header-search{display:block}.search-form .svg-search-handle,.header-search .svg-search-handle{fill:#333}.search-form .svg-search-frame,.header-search .svg-search-frame{stroke:#333}.search-form form [type="text"]:focus,.header-search form [type="text"]:focus{width:160px}.search-form [type="search"],.search-form [type="text"],.header-search [type="search"],.header-search [type="text"]{padding:8px 10px}}@media only screen and (max-width: 1440px){.search-form,.header-search{margin-right:10px}}@media only screen and (max-width: 620px){.banner .search-toggle{right:48px}}.ubuntu-search .nav-secondary,.search-results .nav-secondary,.search-no-results .nav-secondary{display:none}.ubuntu-search section>h1,.ubuntu-search section article h1,.search-results section>h1,.search-results section article h1,.search-no-results section>h1,.search-no-results section article h1{padding-bottom:10px;font-size:1.438em;margin-bottom:0}.ubuntu-search section>h1,.search-results section>h1,.search-no-results section>h1{border-bottom:1px dotted #cdcdcd}.ubuntu-search .main-search,.search-results .main-search,.search-no-results .main-search{background-color:transparent;margin:0 0 20px;padding:20px 0}.ubuntu-search .main-search [type="search"],.search-results .main-search [type="search"],.search-no-results .main-search [type="search"]{border:1px solid #888;float:left;font-size:2em;padding:.2em 65px .2em .2em;width:100%}.ubuntu-search .main-search [type=submit],.search-results .main-search [type=submit],.search-no-results .main-search [type=submit]{width:32px;height:38px;background-repeat:no-repeat;background-position:center 8px;background-color:transparent;background-size:28px 28px;display:block;float:left;line-height:0;margin-left:-53px;margin-top:-4px;overflow:visible;padding:4px}.ubuntu-search .main-search [type=submit] img,.search-results .main-search [type=submit] img,.search-no-results .main-search [type=submit] img{height:45px;width:45px}.ubuntu-search .main-search [type=submit]:hover,.search-results .main-search [type=submit]:hover,.search-no-results .main-search [type=submit]:hover{background:none}.ubuntu-search .search-result h1 .title-main,.search-results .search-result h1 .title-main,.search-no-results .search-result h1 .title-main{margin-right:20px}.ubuntu-search .search-result h1 .result-url,.search-results .search-result h1 .result-url,.search-no-results .search-result h1 .result-url{color:#888;display:block;overflow:hidden;padding-bottom:2px;text-overflow:ellipsis;vertical-align:bottom}.ubuntu-search .search-result h1 .result-url a,.search-results .search-result h1 .result-url a,.search-no-results .search-result h1 .result-url a{color:#888}.ubuntu-search .search-result p,.search-results .search-result p,.search-no-results .search-result p{margin-bottom:0}.ubuntu-search .num-results,.search-results .num-results,.search-no-results .num-results{display:inline-block;margin-left:20px}.ubuntu-search .bottom-results-total,.search-results .bottom-results-total,.search-no-results .bottom-results-total{margin:0;overflow:visible;padding-top:20px;text-align:center;width:100%}.ubuntu-search .bottom-nav,.search-results .bottom-nav,.search-no-results .bottom-nav{margin-top:-26px;overflow:hidden}.ubuntu-search .bottom-nav ul,.search-results .bottom-nav ul,.search-no-results .bottom-nav ul{margin-bottom:0;margin-left:0;overflow:hidden;padding:0}.ubuntu-search .bottom-nav li,.search-results .bottom-nav li,.search-no-results .bottom-nav li{float:left;margin-left:15px}.ubuntu-search .bottom-nav li:first-child,.search-results .bottom-nav li:first-child,.search-no-results .bottom-nav li:first-child{margin-left:0}.ubuntu-search .nav-back,.search-results .nav-back,.search-no-results .nav-back{float:left}.ubuntu-search .nav-back li:before,.search-results .nav-back li:before,.search-no-results .nav-back li:before{color:#f7f7f7;content:'\2039';margin-right:5px}.ubuntu-search .nav-back .item-extreme:before,.search-results .nav-back .item-extreme:before,.search-no-results .nav-back .item-extreme:before{content:'\2039\2039'}.ubuntu-search .nav-forward,.search-results .nav-forward,.search-no-results .nav-forward{float:right}.ubuntu-search .nav-forward li:after,.search-results .nav-forward li:after,.search-no-results .nav-forward li:after{color:#f7f7f7;content:'\203A';margin-left:5px}.ubuntu-search .nav-forward .item-extreme:after,.search-results .nav-forward .item-extreme:after,.search-no-results .nav-forward .item-extreme:after{content:'\203A\203A'}.ubuntu-search .error-notification,.search-results .error-notification,.search-no-results .error-notification{background-color:#fff;color:#333;display:block;margin-top:20px;padding:20px;width:100%}.ubuntu-search .result-line,.search-results .result-line,.search-no-results .result-line{color:#888}.ubuntu-search .results-top,.search-results .results-top,.search-no-results .results-top{border-bottom:1px dotted #cdcdcd;padding-bottom:.5em}.ubuntu-search .search-container,.search-results .search-container,.search-no-results .search-container{padding-bottom:0}@media only screen and (min-width: 620px){.ubuntu-search .main-search [type=submit]{margin-left:-60px;margin-top:0}}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:300;src:url("../assets/fonts/ubuntu-l-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntu-l-webfont.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:400;src:url("../assets/fonts/ubuntu-r-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntu-r-webfont.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:700;src:url("../assets/fonts/ubuntu-b-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntu-b-webfont.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:300;src:url("../assets/fonts/ubuntu-li-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntu-li-webfont.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:400;src:url("../assets/fonts/ubuntu-ri-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntu-ri-webfont.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:700;src:url("../assets/fonts/ubuntu-bi-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntu-bi-webfont.woff") format("woff")}@font-face{font-family:'Ubuntu Mono';font-style:normal;font-weight:400;src:url("../assets/fonts/ubuntumono-r-webfont.woff2") format("woff2"),url("../assets/fonts/ubuntumono-r-webfont.woff") format("woff")}body{color:#333;font-family:'Ubuntu', Arial, 'libra sans', sans-serif;font-size:16px;font-weight:300}a:focus{outline:thin dotted}a:hover,a:active{outline:0}a{color:#f7f7f7;text-decoration:none}a:hover,a:active,a:focus{text-decoration:underline}strong{font-weight:400}.caps-centered,.muted-heading{font-size:.875em;margin-bottom:20px;text-align:center;text-transform:uppercase}small,.smaller{font-size:13px}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{vertical-align:text-top}sub{vertical-align:text-bottom}pre{border-radius:4px;background-color:#fff;padding:.6em 1em;white-space:pre-wrap;word-wrap:break-word}p+h2,ul+h2,ol+h2,pre+h2{margin-top:0.5625em}header nav a:link{font-weight:normal}p+h3,ul+h3,ol+h3,pre+h3{margin-top:.783em}p+h4,ul+h4,ol+h4,pre+h4{margin-top:1.21875}ol+h2,p+h2,pre+h2,ul+h2{margin-top:.563em}ol+h3,p+h3,pre+h3,ul+h3{margin-top:.783em}ol+h4,p+h4,pre+h4,ul+h4{margin-top:1.219em}.intro{font-size:1em;line-height:1.4}.row div p:last-child,.row ul p:last-child{margin-bottom:0}.four-col p:last-child{margin-bottom:0}.note{color:#888;font-size:.813em}h1,h2,h3,h4,h5,h6{font-family:Ubuntu, Arial, 'libra sans', sans-serif;font-weight:300;line-height:1.3}h1{font-size:2.8125em;margin-bottom:.5em}h2{font-size:2em;margin-bottom:.5em}h3{font-size:1.4375em;margin-bottom:.522em}h4{font-size:1.25em;font-weight:400;margin-bottom:.615em}h5{font-size:1em;font-weight:700;margin-bottom:1em}h6{font-size:.8125em;font-weight:400;margin-bottom:1em;letter-spacing:.1em;text-transform:uppercase}p,li{font-size:1em;line-height:1.5;margin:0;margin-bottom:.75em;padding:0}button,input,select,textarea{font-family:Ubuntu,Arial,'libra sans',sans-serif}@media only screen and (min-width: 768px) and (max-width: 1440px){h1{font-size:1.5234375em;margin-bottom:.5em}h2{font-size:1.348125em;margin-bottom:.5em}h3{font-size:1.1428125em;margin-bottom:.522em}h4{font-size:1.171875em;font-weight:400;margin-bottom:.615em}h5{font-size:.9375em;font-weight:700;margin-bottom:1em}h6{font-size:.6778125em;font-weight:400;margin-bottom:1em;letter-spacing:.1em;text-transform:uppercase}.intro{font-size:1.13333em}}@media only screen and (max-width: 768px){h1{font-size:1.421875em;margin-bottom:.4375em}h2{font-size:1.25825em;margin-bottom:.4375em}h3{font-size:1.066625em;margin-bottom:.45675em}h4{font-size:1.09375em;font-weight:400;margin-bottom:.538125em}h5{font-size:.875em;font-weight:700;margin-bottom:.875em}h6{font-size:.632625em;font-weight:400;margin-bottom:.875em;letter-spacing:.1em;text-transform:uppercase}p,li{font-size:.875em}}@media only screen and (min-width: 1440px){p,li,code,pre{font-size:16px;line-height:1.5;margin-bottom:.75em}.intro{font-size:1.25em}}dfn{font-style:italic}code,pre{font-family:'Ubuntu Mono', 'Consolas', 'Monaco', 'Lucida Console', 'Courier New', Courier, monospace}table{border-collapse:collapse;border-spacing:0;overflow-x:scroll;margin-bottom:20px;margin:0 0 2.5em;width:100%}table th,table td{background:#f7f7f7;border:1px dotted #888;padding:15px 10px}table td{text-align:center;vertical-align:middle}table thead th{border-collapse:separate;border-spacing:0 10px;background:#fee3d2;color:#333;font-weight:normal}table tbody th{font-weight:300;text-align:left}table th[scope='col']{text-align:center}table thead th:first-of-type{text-align:left}@media only screen and (max-width: 768px){table{display:block}}body footer.global #nav-global li:first-of-type a{margin-left:0}footer.global{background:none;border-top:0;box-shadow:inset 0 2px 2px -1px #cdcdcd;clear:both;display:block;padding:30px 10px 20px;position:relative;width:100%}footer.global .legal{background-image:none;clear:both;margin:0 auto;min-height:40px;position:relative;width:100%}footer.global .legal p,footer.global .legal ul{padding-left:0}footer.global h2{font-size:.75em;line-height:1.4;margin-bottom:0;padding-bottom:.5em}footer.global h2,footer.global h2 a:link,footer.global h2 a:visited{color:#333;font-weight:normal}footer.global ul{margin:0}footer.global li a:hover{color:#f7f7f7}footer.global li ul li a:link,footer.global li ul li a:visited{color:#333;font-size:.75em}footer.global h2 a:hover,footer.global h2 a:active{color:#f7f7f7}footer.global p{color:#333;font-size:12px;margin-bottom:0}@media only screen and (max-width: 768px){footer.no-global .legal{box-shadow:0 2px 2px -1px #cdcdcd inset;box-sizing:content-box;margin-left:-10px;padding-left:10px;padding-right:10px;padding-top:10px}}@media only screen and (min-width: 1440px){footer.global .legal{width:1440px}footer.global{padding:30px 0 20px}}svg:not(:root){overflow:hidden}figure{width:100%}figure caption{display:block;width:100%;text-align:center}object,iframe,embed,canvas,video,audio{display:block;max-width:100%;margin:0 auto 20px}audio:not([controls]){display:none;height:0}[hidden]{display:none}.video-container{position:relative;padding-bottom:56.25%;padding-top:30px;height:0;overflow:hidden}.video-container iframe{position:absolute;top:0;left:0;width:100%;height:100%}.video-container h3,.video-container .video-title{margin-top:20px}.inline-logos{float:left;margin-left:0;padding:0;text-align:center;width:100%}.inline-logos .inline-logos__item{display:inline-block;margin-right:20px;padding:0 0 20px;width:36%}@media only screen and (max-width: 300px){.inline-logos .inline-logos__item{margin:0 0 20px;width:100%}}.inline-logos .inline-logos__item.clear-row{clear:left}.inline-logos .inline-logos__item.last-item{border:0}.inline-logos .inline-logos__image{max-height:32px;max-width:115px;transition:all .3s ease-out;vertical-align:middle}@media only screen and (min-width: 768px){.inline-logos{padding-top:20px}.inline-logos .inline-logos__item{display:inline-block;height:56px;line-height:60px;margin:0 30px 30px;width:150px}.inline-logos .inline-logos__image{float:none;height:auto;max-height:56px;max-width:150px;vertical-align:middle}}@media only screen and (min-width: 1440px){.inline-logos__item{margin-bottom:40px}}@media only screen and (min-width: 768px){.equal-height__align-vertically{align-items:center;justify-content:center}}@media only screen and (min-width: 768px){.equal-height--vertical-divider{position:relative}.equal-height--vertical-divider__item{padding-left:10px;padding-right:10px}.equal-height--vertical-divider__item:before{content:'';position:absolute;right:-10px;top:0;height:100%;width:1px;border-right:1px dotted #888}.equal-height--vertical-divider .last-col,.equal-height--vertical-divider__item:last-of-type{padding-right:0}.equal-height--vertical-divider .last-col:before,.equal-height--vertical-divider__item:last-of-type:before{border-right:0}.equal-height--vertical-divider__item:first-of-type{padding-left:0}}@media only screen and (max-width: 768px){.equal-height--vertical-divider .equal-height--vertical-divider__item{border-bottom:1px dotted #888;padding-bottom:20px}.equal-height--vertical-divider .equal-height--vertical-divider__item:last-of-type{border-bottom:0;padding-bottom:inherit}}body{background:url("../assets/img/backgrounds/image-background-paper.png") repeat-y center top #f7f7f7}.button--neutral,.button--inline-neutral{color:#333;background-color:transparent;border:1px solid #cdcdcd}.button--neutral:focus,.button--neutral:active,.button--neutral:hover,.button--inline-neutral:focus,.button--inline-neutral:active,.button--inline-neutral:hover{background-color:rgba(0,0,0,0.1)}.button--neutral:disabled:focus,.button--neutral:disabled:active,.button--neutral:disabled:hover,.button--neutral.button--disabled:focus,.button--neutral.button--disabled:active,.button--neutral.button--disabled:hover,.button--inline-neutral:disabled:focus,.button--inline-neutral:disabled:active,.button--inline-neutral:disabled:hover,.button--inline-neutral.button--disabled:focus,.button--inline-neutral.button--disabled:active,.button--inline-neutral.button--disabled:hover{background-color:transparent}.button--inline-neutral{display:inline-block;width:auto}.button--positive,.button--inline-positive{color:#fff;background-color:#38b44a}.button--positive:focus,.button--positive:active,.button--positive:hover,.button--inline-positive:focus,.button--inline-positive:active,.button--inline-positive:hover{background-color:#2c8d3a}.button--positive:disabled:focus,.button--positive:disabled:active,.button--positive:disabled:hover,.button--positive.button--disabled:focus,.button--positive.button--disabled:active,.button--positive.button--disabled:hover,.button--inline-positive:disabled:focus,.button--inline-positive:disabled:active,.button--inline-positive:disabled:hover,.button--inline-positive.button--disabled:focus,.button--inline-positive.button--disabled:active,.button--inline-positive.button--disabled:hover{background-color:#38b44a}.button--inline-positive{display:inline-block;width:auto}.button--destructive,.button--inline-destructive{color:#fff;background-color:#df382c}.button--destructive:focus,.button--destructive:active,.button--destructive:hover,.button--inline-destructive:focus,.button--inline-destructive:active,.button--inline-destructive:hover{background-color:#bc271c}.button--destructive:disabled:focus,.button--destructive:disabled:active,.button--destructive:disabled:hover,.button--destructive.button--disabled:focus,.button--destructive.button--disabled:active,.button--destructive.button--disabled:hover,.button--inline-destructive:disabled:focus,.button--inline-destructive:disabled:active,.button--inline-destructive:disabled:hover,.button--inline-destructive.button--disabled:focus,.button--inline-destructive.button--disabled:active,.button--inline-destructive.button--disabled:hover{background-color:#df382c}.button--inline-destructive{display:inline-block;width:auto}.button--base,.button--inline-base{color:#333;background-color:transparent}.button--base:focus,.button--base:active,.button--base:hover,.button--inline-base:focus,.button--inline-base:active,.button--inline-base:hover{background-color:rgba(0,0,0,0.1)}.button--base:disabled:focus,.button--base:disabled:active,.button--base:disabled:hover,.button--base.button--disabled:focus,.button--base.button--disabled:active,.button--base.button--disabled:hover,.button--inline-base:disabled:focus,.button--inline-base:disabled:active,.button--inline-base:disabled:hover,.button--inline-base.button--disabled:focus,.button--inline-base.button--disabled:active,.button--inline-base.button--disabled:hover{background-color:transparent}.button--inline-base{display:inline-block;width:auto}.cookie-policy{box-shadow:0 -1px 2px rgba(0,0,0,0.2);background-color:#fae4dc;position:fixed;bottom:0;width:100%;z-index:100}.cookie-policy p{font-size:.8125em;margin-bottom:0;margin-left:0;padding:8px 0;width:100%}.cookie-policy .link-cta{background-image:url("https://assets.ubuntu.com/v1/3f057022-close-orange.svg");background-repeat:no-repeat;color:#fff;float:right;font-size:1em;height:15px;margin:12px 0;margin-top:12px;padding:0;text-decoration:none;text-indent:-9999px;width:16px}.no-svg .cookie-policy .link-cta,.opera-mini .cookie-policy .link-cta{background-image:url("https://assets.ubuntu.com/v1/898777ac-close-orange.png")}.deep-link{text-decoration:none}.deep-link:after{content:'';display:inline-block;margin-left:3px;opacity:0;position:relative;top:1px;width:1em;height:1em;background-image:url(https://assets.ubuntu.com/v1/128877a5-anchor_16.svg);background-position:0 80%;background-repeat:no-repeat;background-size:16px;transition:opacity .1s}.deep-link:hover{text-decoration:none}.deep-link:hover:after{opacity:1}.banner{background:#000;box-shadow:none}@media only screen and (min-width: 620px){.banner .nav-primary{width:auto}.banner ul{border-top:0;border-right:0;box-shadow:none}.banner li{width:auto;border-right:0;border-bottom:0}.banner li:last-child a{border-right:0}.banner a,.banner a:link,.banner a:visited{border-left:0}}@media only screen and (max-width: 768px){footer.global{padding-top:0}}.instruction{padding:0;position:relative;width:100%;border-bottom:1px dotted #ddd}.instruction .instruction__bullet,.instruction .instruction__details{padding:60px 40px;margin-bottom:0}.instruction .instruction__bullet{margin-right:0}.instruction .instruction__step{display:inline-block;border-radius:50%;width:50px;height:50px;line-height:50px;color:#fff;text-align:center;vertical-align:top;font-size:2em;font-weight:400}.instruction .instruction__title{display:inline;position:relative;top:6px;line-height:1.6}.instruction .command-line{position:relative;border-radius:4px;background-color:#2c001e;border:1px solid #2c001e;overflow:hidden;transition:all .2s}.instruction .command-line .command-line__input{border:0;background:transparent;font-size:1em;font-family:Ubuntu Mono;font-weight:300;padding:.7em 1em;color:#fff;width:100%}.instruction .command-line .command-line__copy-button{transition:background-color .2s;position:absolute;right:0;top:0;width:50px;border:0;height:100%;display:block;text-indent:-9999px;background-image:url("https://assets.ubuntu.com/v1/994e60f9-get-link-url_16.svg");background-repeat:no-repeat;background-position:center;background-color:#fff}.row{border-bottom:0;background-color:rgba(255,255,255,0.6)}@media only screen and (max-width: 768px){.row{padding-bottom:20px}}@media only screen and (max-width: 768px){.row-hero{padding-top:20px;margin-top:0}}.strip-white{background:#fff}.strip-dark{background:#333;color:#fff}.strip-dark a{color:#fff}.strip-trans{background:transparent}.social-list{list-style:none;padding-left:0;margin-left:0}.social-list__item--twitter,.social-list__item--google-plus,.social-list__item--facebook{margin-right:20px;float:left;text-indent:-99999px;background-image:url("https://assets.ubuntu.com/v1/ed986fc0-icon-social.svg");background-repeat:no-repeat;height:44px;width:44px;overflow:hidden;display:inline-block}.social-list__item--twitter:hover,.social-list__item--google-plus:hover,.social-list__item--facebook:hover{background-position-y:-45px}.social-list__item--twitter{background-position:0 0}.social-list__item--google-plus{background-position:-45px 0}.social-list__item--facebook{background-position:-90px 0}@media only screen and (min-width: 768px){.tooltip{position:relative;display:inline-block}.tooltip__content{position:absolute;z-index:98;left:-1000px;right:-1000px;top:-30px;font-weight:300;margin:auto;display:block;text-align:center;white-space:nowrap}.tooltip:hover .tooltip__content:after{display:table;z-index:98;margin:auto;color:#fff;border-radius:3px;background:#000;box-shadow:none;font-size:12px;content:attr(data-tooltip);padding:4px 6px;white-space:nowrap;text-align:center}.tooltip:hover .tooltip__content:before{position:absolute;top:100%;left:50%;margin-left:-5px;content:'';border:solid transparent;border-width:5px;border-top-color:#000}}a,.link{cursor:pointer;color:#f7f7f7;text-decoration:underline}pre{padding:10px 15px;background-color:#333;border:0;border-radius:2px;color:#cdcdcd}html{overflow-y:scroll;overflow-x:hidden;min-height:100%;color:#333;font:1em / 1.5 "'Ubuntu', Arial, 'libra sans', sans-serif"}a{color:#333;text-decoration:none;border-bottom:1px solid #c2c2c2}a:hover{text-decoration:none;color:#dd4814}p,li,code,pre{font-size:16px;font-size:1rem;line-height:1.5;margin-bottom:.75em}pre,code{text-align:left;white-space:pre-line;word-spacing:normal;word-wrap:break-word;tab-size:4;hyphens:none;direction:ltr}hr{margin-bottom:20px}h1,h2,h3,h4,h5{margin:10px 0;font-weight:300;line-height:1.5;color:#333}h1{font-size:2em}h1 small{font-size:75%}h2{font-size:1.4375em}h2 small{font-size:75%}h3{font-size:1.25em}h3 small{font-size:75%}h4{font-size:1em}h4 small{font-size:75%}h5{font-size:0.875em}h5 small{font-size:75%}.gigantic{font-size:45px;font-size:2.8125rem}.mega{font-size:40px;font-size:2.5rem}input[type='text'],input[type='number'],input[type='search'],input[type='password'],input[type='email'],input[type='url'],input[type='tel']{padding:7px 10px;box-shadow:none;width:100%}input[type='text']::placeholder,input[type='number']::placeholder,input[type='search']::placeholder,input[type='password']::placeholder,input[type='email']::placeholder,input[type='url']::placeholder,input[type='tel']::placeholder{color:#888}input[type='text'][disabled],input[type='number'][disabled],input[type='search'][disabled],input[type='password'][disabled],input[type='email'][disabled],input[type='url'][disabled],input[type='tel'][disabled]{color:#888;background-color:transparent}input[type='number']{padding-right:15px}input[type='search']{appearance:textfield}input[type='search']::-webkit-search-decoration,input[type='search']::-webkit-search-cancel-button{appearance:none}input[type='checkbox']{margin:4px 0 0;margin-top:1px	9;line-height:normal}input[type='radio'],input[type='image']{display:inline-block;margin-right:10px}textarea{height:auto;min-height:175px;padding:7px 10px !important;box-shadow:none;width:100%;line-height:20px}textarea::placeholder{color:#888}textarea[disabled]{color:#888;background-color:transparent}select{display:block;clear:both;cursor:pointer;margin:0;background-image:url("../assets/images/forms/chevron-down.svg");background-repeat:no-repeat;background-position:top 14px right 10px;background-color:#fff;padding:7px 30px 7px 10px !important;box-shadow:none;width:100%;-moz-appearance:none;appearance:none;text-indent:.01px;text-overflow:''}select[multiple],select[size]{height:auto;background-image:none;padding-top:10px}select[disabled]{color:#888;background-image:none;background-color:transparent}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}select::-ms-expand{display:none}fieldset{background:none;margin-left:0;padding:0}label{display:inline-block;max-width:100%;margin-bottom:5px}[type="checkbox"]:not(:checked),[type="checkbox"]:checked{position:absolute;left:-9999px}[type="checkbox"]+label{height:16px;position:relative;padding-left:25px;cursor:pointer}[type="checkbox"]+label:before{content:'';position:absolute;left:0;top:3px;width:11px;height:11px;border:1px solid #cdcdcd;background:#fff;border-radius:2px}[type="checkbox"]:checked+label:before{background-color:#dd4814;border-color:#dd4814}[type="checkbox"]:checked+label:after{content:'✔';position:absolute;line-height:13px;top:3px;left:3px;font-size:10px;color:#fff;transition:all .2s}@-moz-document url-prefix(){[type="checkbox"]:checked+label:after{font-size:13px;left:1px}}[type="checkbox"][disabled]{cursor:not-allowed}[type="checkbox"][disabled]+label{cursor:not-allowed}[type="checkbox"][disabled]+label:before{opacity:.5}[type="radio"]:not(:checked),[type="radio"]:checked{position:absolute;left:-9999px}[type="radio"]+label{position:relative;padding-left:25px;cursor:pointer}[type="radio"]+label:before{content:'';position:absolute;left:0;top:1px;width:13px;height:13px;border:1px solid #cdcdcd;background:#fff;border-radius:50%}[type="radio"]:checked+label:after{content:'';position:absolute;left:3px;top:4px;width:9px;height:9px;background:#dd4814;border-radius:50%}.tags{width:100%}.tags .tag-list{width:100%;margin:0}.tags .tag-list .tag-item{display:inline-block;float:left;line-height:36px;margin-bottom:0;margin-right:10px;word-wrap:break-word}.tags .tag-list .tag-item .remove-button{border-bottom:0}.tags .input{width:100% !important}.onoffswitch{position:relative;display:inline-block;vertical-align:middle;width:38px;margin:0 0 4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch[disabled] .onoffswitch-checkbox,.onoffswitch[disabled] .onoffswitch-label{opacity:.5;pointer-events:none}.onoffswitch-external-label{display:inline-block;margin-left:5px}.onoffswitch-checkbox{display:none !important}.onoffswitch-label{display:block !important;overflow:hidden;cursor:pointer;border-radius:2px;padding-left:0 !important;margin:0 !important}.onoffswitch-label:before,.onoffswitch-label:after{display:none}.onoffswitch-inner{display:block;width:200%;margin-left:-100%;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:18px;padding:0;line-height:18px;font-size:14px;color:#fff;font-family:Trebuchet, Arial, sans-serif;font-weight:bold;box-sizing:border-box}.onoffswitch-inner:before{content:'';padding-left:10px;background-color:#38b44a;color:#fff}.onoffswitch-inner:after{content:'';padding-right:10px;background-color:#eee;color:#888;text-align:right}.onoffswitch-switch{display:block;width:19px;height:16px;margin:0;background:#fff;position:absolute;top:0;bottom:0;right:19px;border:1px solid #d2d2d2;border-radius:2px;transition:all .3s ease-in 0s;box-sizing:border-box}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-left:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:0}dl dt{clear:left;color:#333}dl dd{color:#333;margin-left:0}dl dt,dl dd{display:inline-block;float:left;line-height:36px;margin-bottom:10px !important;word-wrap:break-word}dl dt:last-child,dl dd:last-child{margin-bottom:0}.wrapper{min-height:100%;height:auto !important;height:100%;margin:0 auto;position:relative;background:rgba(255,255,255,0.4)}.wrapper:after{content:'';position:absolute;display:block;top:0;right:0;bottom:0;left:0;background:url("../assets/images/backgrounds/background-paper.png");height:100%;width:100%;z-index:-1}.wrapper--inner{max-width:1440px;width:100%;margin:0 auto;clear:both;display:block}.row{background-color:transparent;border-top:1px dotted #cdcdcd}.row:first-of-type{border-top:0}.button--secondary{line-height:18px}.button--primary:hover,.button--destructive:hover,.button--positive:hover{color:#fff}.button--base:hover,.button--neutral:hover{color:#333}.button--large{height:auto;padding-top:15px;padding-bottom:15px}.button-group{position:relative;width:100%;vertical-align:middle;clear:both;min-width:160px}.button-group.button-group--inline{display:inline-block;width:auto}.button-group .button-group__link{display:inline-block;float:left;text-align:left;padding-right:35px}.button-group .button-group__link::after{content:'';display:inline-block;position:absolute;top:15px;right:15px;width:4px;height:4px;vertical-align:middle;border-right:1px solid;border-bottom:1px solid;transform:rotate(45deg)}.button-group .button-group__dropdown{border-radius:3px;left:0;margin:0;list-style:none;background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);z-index:20;max-height:1000px;transition:max-height .3s ease-in;position:absolute;top:36px;clear:both;min-width:160px}.button-group .button-group__item{float:left;clear:both;padding:5px 10px;margin:0;width:100%}.button-group .button-group__item .button-group__item-link{color:#333;cursor:pointer;width:100%;float:left;margin:0;border:0;text-transform:lowercase;white-space:nowrap}.button-group .button-group__item .button-group__item-link:first-letter{text-transform:uppercase}.button-group .button-group__item .button-group__item-link:hover{color:#dd4814;text-decoration:none}.form .form__group{margin-bottom:10px}.form .form__group .form__group-input{position:relative}.form .form__group .form__group-input .form__group-remove{position:absolute;top:10px;right:10px;cursor:pointer;height:16px;width:16px;background:url("../assets/images/icons/remove.svg") no-repeat;background-size:75% 75%;background-position:center;display:inline-block}.form .form__group .form__group-input .icon,.form .form__group .form__group-input .icon--status-failed,.form .form__group .form__group-input .icon--status-in-progress,.form .form__group .form__group-input .icon--status-queued,.form .form__group .form__group-input .icon--status-succeeded,.form .form__group .form__group-input .icon--status-waiting{position:absolute;top:10px;right:10px;display:inline-block}.form .form__group.form__group--subtle .form__group-label{color:#888}.form .form__group.form__group--subtle input,.form .form__group.form__group--subtle select,.form .form__group.form__group--subtle textarea{border-color:#e3e3e3;background-color:transparent}.form .form__group.form__group--subtle input:hover,.form .form__group.form__group--subtle select:hover,.form .form__group.form__group--subtle textarea:hover{border-color:#cdcdcd;background-color:#fff;outline:none}.form .form__group.form__group--subtle input:active,.form .form__group.form__group--subtle input:focus,.form .form__group.form__group--subtle select:active,.form .form__group.form__group--subtle select:focus,.form .form__group.form__group--subtle textarea:active,.form .form__group.form__group--subtle textarea:focus{border-color:#888;background-color:#fff;outline:none}.form .form__fieldset .form__group:last-of-type{margin-bottom:0}.form .form__siblings{float:left;width:100%;margin-bottom:10px}.form .form__siblings:hover .form__group--subtle input,.form .form__siblings:hover .form__group--subtle select,.form .form__siblings:hover .form__group--subtle textarea{border-color:#cdcdcd;background-color:#fff;outline:none}.form .form__siblings.is-active .form__group--subtle input,.form .form__siblings.is-active .form__group--subtle select,.form .form__siblings.is-active .form__group--subtle textarea{border-color:#cdcdcd;background-color:#fff;outline:none}.form.form--stack .form__group{width:100%;float:left}.form.form--stack .form__group [class*='-col']{margin-bottom:0}.form.form--stack .form__group .form__group-label{margin-top:0;margin-bottom:0;line-height:34px;vertical-align:top}.form.form--stack .form__group .form__group-input{min-height:34px}.form.form--stack .form__group .form__group-input .onoffswitch{margin-top:9px}.form.form--inline .form__fieldset{display:inline-block;width:auto;margin:0;vertical-align:middle}.form.form--inline .form__group{display:inline-block;margin:0 20px 0 0;vertical-align:top}.form.form--inline .form__group .form__group-label{margin-bottom:0;margin-right:10px;vertical-align:top;line-height:34px}.form.form--inline .form__group .form__group-label .icon--left{position:absolute;left:0;top:12px}.form.form--inline .form__group input,.form.form--inline .form__group select,.form.form--inline .form__group .form__group-input{display:inline-block;width:auto;min-height:34px}.form.form--inline .form__group [type='checkbox']+label,.form.form--inline .form__group [type='radio']+label{line-height:34px}.form.form--inline .form__group .onoffswitch{margin:9px 0 0}.form.form--inline .form__group .onoffswitch-external-label{margin:0;vertical-align:middle;line-height:34px}.form .form__help-text{font-size:14px;font-size:0.875rem;color:#888}.form__error{margin:0;color:#df382c}.form__error .form__error-item{margin:6px 0}.code-block{overflow:auto;margin:.5em 0;padding:1em;border:1px solid #cdcdcd;border-radius:.5em}.code-block .code-block__line{float:left;clear:both;margin:0}.code-block.code-block--terminal{color:#fff;border:0;background-color:#333}.code-block.code-block--numbering{counter-reset:line-numbering}.code-block.code-block--numbering .code-block__line::before{width:1.5em;padding-right:1em;content:counter(line-numbering);counter-increment:line-numbering;user-select:none;text-align:right;pointer-events:none;opacity:.5}.flash-messages{width:100%;float:left;margin:0}.flash-messages .flash-messages__item{box-sizing:border-box;border-radius:2px;list-style:none;padding:15px 20px;margin:0 0 20px;background:#fff;background-position:top 50% left 15px;background-repeat:no-repeat;box-shadow:0 1px 1px rgba(0,0,0,0.1)}.flash-messages .flash-messages__item:last-of-type{margin-bottom:0}.flash-messages .flash-messages__item.flash-messages__item--error{background:#fff url("../assets/images/icons/error.svg") no-repeat;background-size:16px 16px;background-position:15px center;padding-left:45px}.flash-messages .flash-messages__item.flash-messages__item--info{background:#fff url("../assets/images/icons/info.svg") no-repeat;background-size:16px 16px;background-position:15px center;padding-left:45px}.flash-messages .flash-messages__item.flash-messages__item--warning{background:#fff url("../assets/images/icons/warning.svg") no-repeat;background-size:16px 16px;background-position:15px center;padding-left:45px}.flash-messages .flash-messages__item.flash-messages__item--success{background:#fff url("../assets/images/icons/success.svg") no-repeat;background-size:16px 16px;background-position:15px center;padding-left:45px}.icon,.icon--status-failed,.icon--status-in-progress,.icon--status-queued,.icon--status-succeeded,.icon--status-waiting{width:16px;height:16px;padding:0;border-bottom:0 !important;display:inline-block;vertical-align:middle;text-indent:999em}.icon.icon--add,.icon--add.icon--status-failed,.icon--add.icon--status-in-progress,.icon--add.icon--status-queued,.icon--add.icon--status-succeeded,.icon--add.icon--status-waiting{background:url("../assets/images/icons/add.svg") no-repeat;background-size:100% 100%}.icon.icon--account,.icon--account.icon--status-failed,.icon--account.icon--status-in-progress,.icon--account.icon--status-queued,.icon--account.icon--status-succeeded,.icon--account.icon--status-waiting{background:url("../assets/images/icons/account.svg") no-repeat;background-size:100% 100%}.icon.icon--cross,.icon--cross.icon--status-failed,.icon--cross.icon--status-in-progress,.icon--cross.icon--status-queued,.icon--cross.icon--status-succeeded,.icon--cross.icon--status-waiting{background:url("../assets/images/icons/cross.svg") no-repeat;background-size:100% 100%}.icon.icon--cross-orange,.icon--cross-orange.icon--status-failed,.icon--cross-orange.icon--status-in-progress,.icon--cross-orange.icon--status-queued,.icon--cross-orange.icon--status-succeeded,.icon--cross-orange.icon--status-waiting{background:url("../assets/images/icons/cross-orange.svg") no-repeat;background-size:100% 100%}.icon.icon--debug,.icon--debug.icon--status-failed,.icon--debug.icon--status-in-progress,.icon--debug.icon--status-queued,.icon--debug.icon--status-succeeded,.icon--debug.icon--status-waiting{background:url("../assets/images/icons/debug.svg") no-repeat;background-size:100% 100%}.icon.icon--delete,.icon--delete.icon--status-failed,.icon--delete.icon--status-in-progress,.icon--delete.icon--status-queued,.icon--delete.icon--status-succeeded,.icon--delete.icon--status-waiting{background:url("../assets/images/icons/delete.svg") no-repeat;background-size:100% 100%}.icon.icon--edit,.icon--edit.icon--status-failed,.icon--edit.icon--status-in-progress,.icon--edit.icon--status-queued,.icon--edit.icon--status-succeeded,.icon--edit.icon--status-waiting{background:url("../assets/images/icons/edit.svg") no-repeat;background-size:100% 100%}.icon.icon--error,.icon--error.icon--status-failed,.icon--error.icon--status-in-progress,.icon--error.icon--status-queued,.icon--error.icon--status-succeeded,.icon--error.icon--status-waiting{background:url("../assets/images/icons/error.svg") no-repeat;background-size:100% 100%}.icon.icon--help,.icon--help.icon--status-failed,.icon--help.icon--status-in-progress,.icon--help.icon--status-queued,.icon--help.icon--status-succeeded,.icon--help.icon--status-waiting{background:url("../assets/images/icons/help.svg") no-repeat;background-size:100% 100%}.icon.icon--info,.icon--info.icon--status-failed,.icon--info.icon--status-in-progress,.icon--info.icon--status-queued,.icon--info.icon--status-succeeded,.icon--info.icon--status-waiting{background:url("../assets/images/icons/info.svg") no-repeat;background-size:100% 100%}.icon.icon--loading,.icon--loading.icon--status-failed,.icon--loading.icon--status-in-progress,.icon--loading.icon--status-queued,.icon--loading.icon--status-succeeded,.icon--loading.icon--status-waiting{background:url("../assets/images/icons/loading.png") no-repeat;background-size:100% 100%}.icon.icon--mount,.icon--mount.icon--status-failed,.icon--mount.icon--status-in-progress,.icon--mount.icon--status-queued,.icon--mount.icon--status-succeeded,.icon--mount.icon--status-waiting{background:url("../assets/images/icons/mount.svg") no-repeat;background-size:100% 100%}.icon.icon--unmount,.icon--unmount.icon--status-failed,.icon--unmount.icon--status-in-progress,.icon--unmount.icon--status-queued,.icon--unmount.icon--status-succeeded,.icon--unmount.icon--status-waiting{background:url("../assets/images/icons/unmount.svg") no-repeat;background-size:100% 100%}.icon.icon--partition,.icon--partition.icon--status-failed,.icon--partition.icon--status-in-progress,.icon--partition.icon--status-queued,.icon--partition.icon--status-succeeded,.icon--partition.icon--status-waiting{background:url("../assets/images/icons/partition.svg") no-repeat;background-size:100% 100%}.icon.icon--power-error,.icon--power-error.icon--status-failed,.icon--power-error.icon--status-in-progress,.icon--power-error.icon--status-queued,.icon--power-error.icon--status-succeeded,.icon--power-error.icon--status-waiting{background:url("../assets/images/icons/power-error.svg") no-repeat;background-size:100% 100%}.icon.icon--power-off,.icon--power-off.icon--status-failed,.icon--power-off.icon--status-in-progress,.icon--power-off.icon--status-queued,.icon--power-off.icon--status-succeeded,.icon--power-off.icon--status-waiting{background:url("../assets/images/icons/power-off.svg") no-repeat;background-size:100% 100%}.icon.icon--power-on,.icon--power-on.icon--status-failed,.icon--power-on.icon--status-in-progress,.icon--power-on.icon--status-queued,.icon--power-on.icon--status-succeeded,.icon--power-on.icon--status-waiting{background:url("../assets/images/icons/power-on.svg") no-repeat;background-size:100% 100%}.icon.icon--remove,.icon--remove.icon--status-failed,.icon--remove.icon--status-in-progress,.icon--remove.icon--status-queued,.icon--remove.icon--status-succeeded,.icon--remove.icon--status-waiting{background:url("../assets/images/icons/remove.svg") no-repeat;background-size:100% 100%}.icon.icon--success,.icon--success.icon--status-failed,.icon--success.icon--status-in-progress,.icon--success.icon--status-queued,.icon--success.icon--status-succeeded,.icon--success.icon--status-waiting{background:url("../assets/images/icons/success.svg") no-repeat;background-size:100% 100%}.icon.icon--success-mono,.icon--success-mono.icon--status-failed,.icon--success-mono.icon--status-in-progress,.icon--success-mono.icon--status-queued,.icon--success-mono.icon--status-succeeded,.icon--success-mono.icon--status-waiting{background:url("../assets/images/icons/success-mono.svg") no-repeat;background-size:100% 100%}.icon.icon--success-grey,.icon--success-grey.icon--status-failed,.icon--success-grey.icon--status-in-progress,.icon--success-grey.icon--status-queued,.icon--success-grey.icon--status-succeeded,.icon--success-grey.icon--status-waiting{background:url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="success"><rect id="rect6708" x="0" y="9.99999989e-06" width="16" height="16"></rect><circle id="circle6710" stroke="#888" stroke-width="1.5" fill="#888" cx="8" cy="8.00001" r="7.2500086"></circle><polygon id="path6712" fill="#fff" points="11.80029 4.92345 11.73439 4.98115 6.99964 9.12837 4.22407 6.74743 3.38501 7.69631 7.00033 11.50002 12.5 5.71278 11.80029 4.92349"></polygon></g></g></svg>');background-size:100% 100%}.icon.icon--settings,.icon--settings.icon--status-failed,.icon--settings.icon--status-in-progress,.icon--settings.icon--status-queued,.icon--settings.icon--status-succeeded,.icon--settings.icon--status-waiting{background:url("../assets/images/icons/settings.svg") no-repeat;background-size:100% 100%}.icon.icon--sync,.icon--sync.icon--status-failed,.icon--sync.icon--status-in-progress,.icon--sync.icon--status-queued,.icon--sync.icon--status-succeeded,.icon--sync.icon--status-waiting{background:url("../assets/images/icons/sync.svg") no-repeat;background-size:100% 100%}.icon.icon--search,.icon--search.icon--status-failed,.icon--search.icon--status-in-progress,.icon--search.icon--status-queued,.icon--search.icon--status-succeeded,.icon--search.icon--status-waiting{background:url("../assets/images/icons/magnifying_glass.svg") no-repeat;background-size:100% 100%}.icon.icon--system-shutdown,.icon--system-shutdown.icon--status-failed,.icon--system-shutdown.icon--status-in-progress,.icon--system-shutdown.icon--status-queued,.icon--system-shutdown.icon--status-succeeded,.icon--system-shutdown.icon--status-waiting{background:url("../assets/images/icons/system-shutdown.svg") no-repeat;background-size:100% 100%}.icon.icon--tooltip,.icon--tooltip.icon--status-failed,.icon--tooltip.icon--status-in-progress,.icon--tooltip.icon--status-queued,.icon--tooltip.icon--status-succeeded,.icon--tooltip.icon--status-waiting{background:url("../assets/images/icons/tooltip.svg") no-repeat;background-size:100% 100%}.icon.icon--tags,.icon--tags.icon--status-failed,.icon--tags.icon--status-in-progress,.icon--tags.icon--status-queued,.icon--tags.icon--status-succeeded,.icon--tags.icon--status-waiting{background:url("../assets/images/icons/tags.svg") no-repeat;background-size:100% 100%}.icon.icon--tick,.icon--tick.icon--status-failed,.icon--tick.icon--status-in-progress,.icon--tick.icon--status-queued,.icon--tick.icon--status-succeeded,.icon--tick.icon--status-waiting{background:url("../assets/images/icons/tick.svg") no-repeat;background-size:100% 100%}.icon.icon--logical-volume,.icon--logical-volume.icon--status-failed,.icon--logical-volume.icon--status-in-progress,.icon--logical-volume.icon--status-queued,.icon--logical-volume.icon--status-succeeded,.icon--logical-volume.icon--status-waiting{background:url("../assets/images/icons/logical-volume.svg") no-repeat;background-size:100% 100%}.icon.icon--warning,.icon--warning.icon--status-failed,.icon--warning.icon--status-in-progress,.icon--warning.icon--status-queued,.icon--warning.icon--status-succeeded,.icon--warning.icon--status-waiting{background:url("../assets/images/icons/warning.svg") no-repeat;background-size:100% 100%}.icon.icon--warning-mono,.icon--warning-mono.icon--status-failed,.icon--warning-mono.icon--status-in-progress,.icon--warning-mono.icon--status-queued,.icon--warning-mono.icon--status-succeeded,.icon--warning-mono.icon--status-waiting{background:url("../assets/images/icons/warning-mono.svg") no-repeat}.icon.icon--open,.icon--open.icon--status-failed,.icon--open.icon--status-in-progress,.icon--open.icon--status-queued,.icon--open.icon--status-succeeded,.icon--open.icon--status-waiting{background:url("../assets/images/forms/chevron-down.svg") no-repeat;background-size:10px 4px;background-position:center 4px}.icon.icon--close,.icon--close.icon--status-failed,.icon--close.icon--status-in-progress,.icon--close.icon--status-queued,.icon--close.icon--status-succeeded,.icon--close.icon--status-waiting{background:url("../assets/images/forms/chevron-up.svg") no-repeat;background-size:10px 4px;background-position:center 4px}.icon--status-failed{content:url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#ed3146" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#ed3146" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>')}.icon--status-in-progress{content:url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#19b6ee" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#19b6ee" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>')}.icon--status-queued{content:url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#888" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#888" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>')}.icon--status-succeeded{content:url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#3eb34f" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#3eb34f" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>')}.icon--status-waiting{content:url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#f99b0f" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#f99b0f" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>')}.icon--small{width:14px;height:14px}.icon--large{width:20px;height:20px}.icon--mega{width:23px;height:23px}.icon--gigantic{width:32px;height:32px}h1 .icon,h1 .icon--status-failed,h1 .icon--status-in-progress,h1 .icon--status-queued,h1 .icon--status-succeeded,h1 .icon--status-waiting{margin-top:-6px}h2 .icon,h2 .icon--status-failed,h2 .icon--status-in-progress,h2 .icon--status-queued,h2 .icon--status-succeeded,h2 .icon--status-waiting,h3 .icon,h3 .icon--status-failed,h3 .icon--status-in-progress,h3 .icon--status-queued,h3 .icon--status-succeeded,h3 .icon--status-waiting{margin-top:-5px}h4 .icon,h4 .icon--status-failed,h4 .icon--status-in-progress,h4 .icon--status-queued,h4 .icon--status-succeeded,h4 .icon--status-waiting,h5 .icon,h5 .icon--status-failed,h5 .icon--status-in-progress,h5 .icon--status-queued,h5 .icon--status-succeeded,h5 .icon--status-waiting,p .icon,p .icon--status-failed,p .icon--status-in-progress,p .icon--status-queued,p .icon--status-succeeded,p .icon--status-waiting,label .icon,label .icon--status-failed,label .icon--status-in-progress,label .icon--status-queued,label .icon--status-succeeded,label .icon--status-waiting,button .icon,button .icon--status-failed,button .icon--status-in-progress,button .icon--status-queued,button .icon--status-succeeded,button .icon--status-waiting,a .icon,a .icon--status-failed,a .icon--status-in-progress,a .icon--status-queued,a .icon--status-succeeded,a .icon--status-waiting,th .icon,th .icon--status-failed,th .icon--status-in-progress,th .icon--status-queued,th .icon--status-succeeded,th .icon--status-waiting,td .icon,td .icon--status-failed,td .icon--status-in-progress,td .icon--status-queued,td .icon--status-succeeded,td .icon--status-waiting,.table__header .icon,.table__header .icon--status-failed,.table__header .icon--status-in-progress,.table__header .icon--status-queued,.table__header .icon--status-succeeded,.table__header .icon--status-waiting,.table__data .icon,.table__data .icon--status-failed,.table__data .icon--status-in-progress,.table__data .icon--status-queued,.table__data .icon--status-succeeded,.table__data .icon--status-waiting{margin-top:-3px}.list__tree{list-style:none;border-left:1px solid #d2d2d2;position:relative}.list__tree.list__tree--sub-level{margin-top:10px;margin-left:20px;clear:both}.list__tree.list__tree--sub-level .list__item .list__item-feedback{left:180px}.list__tree .list__item{list-style:none}.list__tree .list__item:before{content:'';width:12px;height:1px;background:#d2d2d2;display:inline-block;position:relative;top:-4px;margin-right:5px}.list__tree .list__item:last-child::after{content:'';width:4px;height:1em;position:absolute;display:block;left:-2px;bottom:-6px;background:#fafafa}.list__tree .list__item .list__item-feedback{position:relative;left:200px;margin-top:-24px}table,.table{border-color:#d2d2d2;border-spacing:0;overflow-x:scroll;margin:0 0 20px;width:100%;text-align:left;border-collapse:separate}table tr,.table table tr,table .table tr,.table .table__row{width:100%;border-color:#b2b2b2;border-bottom-style:dotted;border-bottom-width:1px}table th,.table table th,table .table th,table td,.table table td,table .table td,.table .table__header,.table .table__data{font-size:16px;font-size:1rem;padding:10px;box-sizing:border-box;min-height:21px;background:none;border:0;text-align:left;border-collapse:separate;vertical-align:top;backface-visibility:hidden;position:relative}table thead tr,.table table thead tr,table thead .table tr,.table .table__head .table__row{color:#888;border-bottom:1px solid}table thead tr:hover,.table .table__head .table__row:hover{background-color:transparent}table thead th,.table table thead th,table thead .table th,.table .table__head .table__header{font-size:13px;font-size:0.8125rem;background:none;color:#888;font-size:13px}table thead th input[type="radio"]+label,.table .table__head .table__header input[type="radio"]+label,table thead th input[type="checkbox"]+label,.table .table__head .table__header input[type="checkbox"]+label{margin:0;top:-3px}table thead th a:link,table thead th a:visited,.table .table__head .table__header .table__header-link{color:#888;border-bottom:0}table thead th a:hover:link,table thead th a:hover:visited,.table .table__head .table__header .table__header-link:hover{color:#333;text-decoration:none}table thead th a.is-active:link,table thead th a.is-active:visited,.table .table__head .table__header .is-active.table__header-link{color:#333;text-decoration:none}table thead th a.is-sorted:link,table thead th a.is-sorted:visited,.table .table__head .table__header .is-sorted.table__header-link{border-bottom:1px solid #333}table thead .divide,.table .table__head .table__header-divide,.table .table__head .divide{width:1px;display:inline-block;background:#888;height:10px;margin:0 5px}table .numerical,.table .numerical{text-align:right}table input[type="radio"]+label,.table input[type="radio"]+label,table input[type="checkbox"]+label,.table input[type="checkbox"]+label{margin:0;top:-1px}table th{color:#888;border-bottom:1px solid}table td{border-color:#b2b2b2;border-bottom-style:dotted;border-bottom-width:1px}table td a:link,table td a:visited{color:#333;border-bottom:1px solid #c2c2c2}table td a:link:hover,table td a:visited:hover{text-decoration:none;color:#dd4814}table thead{width:100% !important;display:table-header-group !important}table thead.table__head--sticky{background:#fff;padding:0;width:100vw !important;left:0 !important;right:0 !important;height:auto}table thead.table__head--sticky tr{max-width:1440px;width:100%;margin:0 auto;display:block;float:none;border-bottom:0;overflow:hidden}table thead.table__head--sticky tr th{border-bottom:0;float:left}.table{display:table}.table .table__row{float:left;display:table-row}.table .table__row:hover{background-color:#fff}.table .table__row:hover .table__controls{z-index:1;opacity:1}.table .table__row:hover .table__controls--secondary{z-index:1;opacity:1}.table .table__row.is-active{background-color:#fff}.table .table__row.is-active .table__controls{z-index:1;opacity:1}.table .table__row.is-active .table__controls--secondary{z-index:1;opacity:1}.table .table__row.is-active .table__dropdown .table__row{display:none}.table .table__row.is-active .table__dropdown .table__row.is-active{display:block}.table .table__header,.table .table__data{display:table-cell;float:left}.table .table__data a:link,.table .table__data a:visited{color:#333;border-bottom:1px solid #c2c2c2}.table .table__data a:link:hover,.table .table__data a:visited:hover{text-decoration:none;color:#dd4814}.table .table__head{display:table-head;width:100%;box-sizing:border-box;width:auto !important}.table .table__head.table__head--sticky{background:#fff;padding:0;width:100vw !important;left:0 !important;right:0 !important;border-top:1px dotted #d2d2d2;box-shadow:0 1px 1px rgba(0,0,0,0.1);height:auto !important}.table .table__head.table__head--sticky .table__row{max-width:1440px;width:100%;margin:0 auto;display:block;float:none;border-bottom:0;overflow:hidden}.table .table__body{display:table-row-group}.table .table__footer{display:table-footer-group}.table .table__label{clear:both;display:block;margin-top:5px;line-height:16px;color:#bcbcbc}.table .table__label a{color:#bcbcbc}.table .table__label a:hover{color:#f7f7f7}.table .table__label.is-active a{color:#f7f7f7}.table .table__controls{width:100%;text-align:right;opacity:0;z-index:-1000}.table .table__controls--secondary{opacity:0;z-index:-1000;width:auto;text-align:left}.table .table__controls a,.table .table__controls a:link,.table .table__controls a:visited{color:#333;border-bottom:1px solid #c2c2c2}.table .table__controls a:hover,.table .table__controls a:link:hover,.table .table__controls a:visited:hover{text-decoration:none;color:#dd4814}.table .table__input{display:inline-block;background-color:#fff;border-color:#d2d2d2;background-position:right 10px top 16px;margin:-7px 0}.table .table__input[disabled]{background-color:transparent;border-color:transparent;pointer-events:none;background-position:-9999px -9999px;color:#333}.table .table__dropdown{width:100%}.table .table__dropdown .table__row{border-bottom:0;display:none;position:relative}.table .table__dropdown .table__row--indent{padding-left:41px !important;float:left;width:100%;box-sizing:border-box}.table .table__dropdown .table__row:before{display:block;margin:0 auto;width:calc(100% - 20px);border-top:1px dotted #d2d2d2;position:absolute;height:1px;content:'';top:0;left:10px}.table .table__dropdown .table__row.table__row--head{border-bottom:0}.table .table__dropdown .table__row.table__row--head .table__header{color:#bcbcbc;font-size:13px}.table .table__dropdown .table__row.u-border--none:before{display:none}.table .table__dropdown .table__row.u-border:before{display:block;margin:0 auto;width:calc(100% - 20px);border-top:1px dotted #d2d2d2;position:absolute;height:1px;content:'';top:0;left:10px}.table .table__dropdown .table__row.is-active .table__input{background-color:#fff;border-color:#d2d2d2;background-position:right 10px top 16px;pointer-events:all}.table .table__dropdown .table__row.is-active .table__input[disabled]{border-color:transparent;cursor:pointer}.table .table__dropdown--info .table__row{border-bottom:0}.table .table__dropdown--info .table__data{color:#bcbcbc}.form .form__group input,.form .form__group select{margin:0}.table--error{border-color:#df382c}.table--error .table__header,.table--error .table__data,.table--error th,.table--error td{border-color:#df382c;background-color:#fadfdd}.table--warning{border-color:#eca918}.table--warning .table__header,.table--warning .table__data,.table--warning th,.table--warning td{border-color:#eca918;background-color:#fcefd4}.table--success{border-color:#38b44a}.table--success .table__header,.table--success .table__data,.table--success th,.table--success td{border-color:#38b44a;background-color:#caeecf}.table--information{border-color:#19b6ee}.table--information .table__header,.table--information .table__data,.table--information th,.table--information td{border-color:#19b6ee;background-color:#d7f2fc}.table-col--1{width:1%}.table-col--2{width:2%}.table-col--3{width:3%}.table-col--4{width:4%}.table-col--5{width:5%}.table-col--6{width:6%}.table-col--7{width:7%}.table-col--8{width:8%}.table-col--9{width:9%}.table-col--10{width:10%}.table-col--11{width:11%}.table-col--12{width:12%}.table-col--13{width:13%}.table-col--14{width:14%}.table-col--15{width:15%}.table-col--16{width:16%}.table-col--17{width:17%}.table-col--18{width:18%}.table-col--19{width:19%}.table-col--20{width:20%}.table-col--21{width:21%}.table-col--22{width:22%}.table-col--23{width:23%}.table-col--24{width:24%}.table-col--25{width:25%}.table-col--26{width:26%}.table-col--27{width:27%}.table-col--28{width:28%}.table-col--29{width:29%}.table-col--30{width:30%}.table-col--31{width:31%}.table-col--32{width:32%}.table-col--33{width:33%}.table-col--34{width:34%}.table-col--35{width:35%}.table-col--36{width:36%}.table-col--37{width:37%}.table-col--38{width:38%}.table-col--39{width:39%}.table-col--40{width:40%}.table-col--41{width:41%}.table-col--42{width:42%}.table-col--43{width:43%}.table-col--44{width:44%}.table-col--45{width:45%}.table-col--46{width:46%}.table-col--47{width:47%}.table-col--48{width:48%}.table-col--49{width:49%}.table-col--50{width:50%}.table-col--51{width:51%}.table-col--52{width:52%}.table-col--53{width:53%}.table-col--54{width:54%}.table-col--55{width:55%}.table-col--56{width:56%}.table-col--57{width:57%}.table-col--58{width:58%}.table-col--59{width:59%}.table-col--60{width:60%}.table-col--61{width:61%}.table-col--62{width:62%}.table-col--63{width:63%}.table-col--64{width:64%}.table-col--65{width:65%}.table-col--66{width:66%}.table-col--67{width:67%}.table-col--68{width:68%}.table-col--69{width:69%}.table-col--70{width:70%}.table-col--71{width:71%}.table-col--72{width:72%}.table-col--73{width:73%}.table-col--74{width:74%}.table-col--75{width:75%}.table-col--76{width:76%}.table-col--77{width:77%}.table-col--78{width:78%}.table-col--79{width:79%}.table-col--80{width:80%}.table-col--81{width:81%}.table-col--82{width:82%}.table-col--83{width:83%}.table-col--84{width:84%}.table-col--85{width:85%}.table-col--86{width:86%}.table-col--87{width:87%}.table-col--88{width:88%}.table-col--89{width:89%}.table-col--90{width:90%}.table-col--91{width:91%}.table-col--92{width:92%}.table-col--93{width:93%}.table-col--94{width:94%}.table-col--95{width:95%}.table-col--96{width:96%}.table-col--97{width:97%}.table-col--98{width:98%}.table-col--99{width:99%}.table-col--100{width:100%}.tabs{display:inline-block}.tabs .tabs__tab{font-size:18px;font-size:1.125rem;display:inline-block;list-style-type:none}.tabs .tabs__tab .tabs__tab-link{color:#888;text-decoration:none;border-bottom:0}.tabs .tabs__tab:hover .tabs__tab-link{border-bottom:3px solid #888}.tabs .tabs__tab:after{content:'';width:1px;display:inline-block;background:#d2d2d2;height:11px;padding:0;margin:0 5px}.tabs .tabs__tab:last-child::after{display:none}.tabs .is-active .tabs__tab-link,.tabs .is-active:hover .tabs__tab-link{border-bottom:3px solid #dd4814}.tooltip{position:relative}.tooltip::before{position:absolute;left:50%;transform:translateX(-50%) translateY(-14px);content:'';width:0;height:0;border-left:5px solid transparent;border-right:5px solid transparent;z-index:-1;border-top:5px solid #333;opacity:0;visibility:hidden;bottom:100%;margin-bottom:-11px}.tooltip::after{content:attr(aria-label);font-size:13px;font-weight:400;line-height:16px;position:absolute;z-index:-1;left:50%;bottom:100%;transform:translateX(-50%) translateY(-8px);background:#333;color:#fff;padding:10px;height:auto;text-indent:0;opacity:0;visibility:hidden;border-radius:5px;box-shadow:0 1px 3px 0 rgba(51,51,51,0.2);white-space:pre;box-sizing:border-box;font-style:normal}.tooltip:hover::after,.tooltip:hover::before{opacity:1 !important;z-index:1000;visibility:visible}.tooltip.tooltip--right::before{border-top:5px solid transparent;border-right:5px solid #333;border-bottom:5px solid transparent;left:100%;bottom:inherit;top:50%;transform:translateX(4px) translateY(-50%)}.tooltip.tooltip--right::after{left:100%;bottom:inherit;top:50%;margin-bottom:-14px;transform:translateX(14px) translateY(-50%)}.tooltip.tooltip--bottom::before{border-top:0;border-right:5px solid transparent;border-bottom:5px solid #333;border-left:5px solid transparent;left:50%;bottom:inherit;top:100%;transform:translateX(-50%) translateY(8px)}.tooltip.tooltip--bottom::after{left:50%;bottom:inherit;top:100%;margin-bottom:0;transform:translateX(-50%) translateY(13px)}.tooltip.tooltip--left::before{border-top:5px solid transparent;border-left:5px solid #333;border-bottom:5px solid transparent;left:-4px;bottom:inherit;top:50%;transform:translateX(-100%) translateY(-50%)}.tooltip.tooltip--left::after{left:-14px;bottom:inherit;top:50%;margin-bottom:-14px;transform:translateX(-100%) translateY(-50%)}.accordion{box-sizing:border-box;border-radius:2px;list-style:none;background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);margin-bottom:40px}.accordion.is-disabled{opacity:.5;pointer-events:none}.accordion .accordion__title{font-size:20px;font-size:1.25rem;border-bottom:1px dotted #b2b2b2;padding:8px 20px 9px;margin:0}.accordion .accordion__tab{border-bottom:1px dotted #b2b2b2}.accordion .accordion__tab:last-of-type{border:0}.accordion .accordion__tab .accordion__tab-title.is-active{background-image:url("../assets/images/forms/chevron_up.svg")}.accordion .accordion__tab .accordion__tab-title.is-active+.accordion__tab-content{max-height:400px;transition:max-height .5s ease-in}.accordion .accordion__tab .accordion__tab-content{max-height:0;transition:max-height .5s ease-out;overflow:hidden;overflow:auto}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list{list-style-type:none;padding:0 20px 14px;margin:0}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item{margin-bottom:.15em}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item .accordion__tab-link{box-sizing:border-box;color:#333;width:100%;display:inline-block;padding-right:20px;border-bottom:0;outline:0}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item .accordion__tab-link:hover{color:#dd4814;text-decoration:none}.disabled .accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item .accordion__tab-link{color:#333}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.is-active{margin-bottom:.15em;font-weight:400}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.is-active .accordion__tab-link{background:transparent url("../assets/images/icons/cross.svg") top 7px right 0 no-repeat;text-decoration:none}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.is-active:hover{color:#f7f7f7}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.is-active:hover .accordion__tab-link{color:#dd4814;background-image:url("../assets/images/icons/cross_orange.svg")}.accordion .accordion__tab .accordion__tab-title,.accordion .accordion__tab .accordion__tab-title.is-active{padding:12px 20px;margin:0;color:#888;cursor:pointer;background:transparent url("../assets/images/forms/chevron_down.svg") top 20px right 20px no-repeat}.action-card{background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);margin-bottom:40px;padding:20px 20px 10px;box-sizing:border-box;width:100%;display:inline-block;clear:both}.action-card .action-card__title{font-size:23px;margin-bottom:20px}.action-card .action-card__controls{border-top:1px dotted #888;width:100%;display:inline-block;margin:10px 0 0;padding:10px 0 0;box-sizing:border-box}.banner{background-color:#000}@media only screen and (min-width: 620px){.banner{box-shadow:none}.banner .nav-primary{max-width:none}.banner .nav-primary .logo{height:auto;margin-top:12px}.banner .nav-primary .logo a{border-bottom:0}.banner .nav-primary ul li{border-left:1px solid #333}.banner .nav-primary ul li:last-child{border-right:1px solid #333;border-left:1px solid #333}.banner .nav-primary ul li a,.banner .nav-primary ul li a:link,.banner .nav-primary ul li a:visited{box-sizing:border-box;border-bottom:0;border-left:0}.banner .nav-primary ul li a:hover,.banner .nav-primary ul li a:link:hover,.banner .nav-primary ul li a:visited:hover{background-color:rgba(51,51,51,0.9)}.banner .nav-primary ul li a.active,.banner .nav-primary ul li a:link.active,.banner .nav-primary ul li a:visited.active{background-color:transparent;box-shadow:inset 0px -3px #dd4814}.banner .nav-primary ul li a.active:hover,.banner .nav-primary ul li a:link.active:hover,.banner .nav-primary ul li a:visited.active:hover{background-color:rgba(51,51,51,0.9)}}.page-header{box-sizing:border-box;background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);padding:0 20px;height:auto !important;width:100%;float:left;margin-bottom:20px}.page-header .page-header__title{font-size:32px;font-size:2rem;margin:0;padding:34px 0;display:inline-block}.page-header .page-header__title [contenteditable="true"]{font-size:32px;font-size:2rem;padding:8px 10px;width:auto;box-sizing:border-box;border:1px solid transparent;margin:-20px 0 -20px -10px;border-radius:2px;color:#333;cursor:default;display:inline-block}.page-header .page-header__title [contenteditable="true"].editmode,.page-header .page-header__title [contenteditable="true"].editable:hover{border:1px solid #D2D2D2;cursor:text}.page-header .page-header__title [contenteditable="true"].editmode:hover,.page-header .page-header__title [contenteditable="true"]:active,.page-header .page-header__title [contenteditable="true"]:focus{outline:none;background-color:#fff;border:1px solid #B2B2B2}.page-header .page-header__title [contenteditable="true"].invalid,.page-header .page-header__title [contenteditable="true"].invalid:hover,.page-header .page-header__title [contenteditable="true"].invalid:active,.page-header .page-header__title [contenteditable="true"].invalid:focus{border-color:#df382c}.page-header .page-header__title .page-header__title-dot{display:inline-block;width:auto;padding:0}.page-header .page-header__title .page-header__title-domain{font-size:32px;font-size:2rem;display:inline-block;width:auto;min-height:66px;max-height:66px;line-height:25px;margin:-20px 0;background-position:top 32px right 10px;padding:13px 10px !important}.page-header .page-header__status{font-size:19px;font-size:1.1875rem;width:auto;display:inline-block;position:relative;margin-left:20px;color:#888}.page-header .page-header__status .page-header__status-check{font-size:16px;font-size:1rem;margin-left:10px;color:inherit;border:0}.page-header .page-header__status .page-header__status-check:hover{text-decoration:underline}.page-header .page-header__controls{padding:40px 0;display:inline-block;float:right}.page-header .page-header__controls .page-header__controls-feedback{color:#333;text-decoration:none;border-bottom:1px solid #c2c2c2}.page-header .page-header__controls .page-header__controls-feedback:hover{text-decoration:none;color:#dd4814;cursor:pointer}.page-header .page-header__dropdown{max-height:0;overflow:hidden;-webkit-transition:max-height 0.3s ease;-moz-transition:max-height 0.3s ease;transition:max-height 0.3s ease}.page-header .page-header__dropdown.is-open{max-height:1000px}.page-header .page-header__dropdown .page-header__section{border-top:1px dotted #888;padding-top:20px;padding-bottom:20px}.page-header .page-header__dropdown .page-header__message{width:auto;display:inline-block;float:none;margin:0 20px 0 0;line-height:36px}.page-header .page-header__dropdown .page-header__message--error{background:url("../assets/images/icons/error.svg") no-repeat;background-size:16px 16px;background-position:0 10px;padding-left:25px}.page-header .page-header__dropdown .page-header__message--info{background:url("../assets/images/icons/info.svg") no-repeat;background-size:16px 16px;background-position:0 10px;padding-left:25px}.page-header .page-header__dropdown .page-header__message--warning{background:url("../assets/images/icons/warning.svg") no-repeat;background-size:16px 16px;background-position:0 10px;padding-left:25px}.page-header .page-header__dropdown .page-header__message--success{background:url("../assets/images/icons/success.svg") no-repeat;background-size:16px 16px;background-position:0 10px;padding-left:25px}.page-header .page-header__dropdown .page-header__controls{padding:0;float:right}.search{position:relative}.search .search__input{font-size:16px;font-size:1rem;box-sizing:border-box;border-radius:4px;list-style:none;background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);width:100%;border:0;padding:15px;appearance:textfield}.search .search__input::placeholder{color:#888}.search .search__input::-ms-clear{display:none}.search .search__input::-webkit-search-decoration,.search .search__input::-webkit-search-cancel-button,.search .search__input::-webkit-search-results-button,.search .search__input::-webkit-search-results-decoration{display:none}.search .search__input:disabled,.search .search__input.search--disabled{background-color:#fff;opacity:.5;pointer-events:none}.search .search__input:disabled+.search__submit,.search .search__input.search--disabled+.search__submit{pointer-events:none;opacity:.5}.search .search__submit{position:absolute;top:15px;right:15px;background-color:transparent;background-image:url("../assets/images/icons/magnifying_glass.svg");background-position:center;background-repeat:no-repeat;background-size:20px;text-indent:-999em;display:block;width:20px;height:20px;overflow:hidden;outline:none;padding:0;border:0}.search .search__submit:hover{background-color:transparent;background-image:url("../assets/images/icons/magnifying_glass.svg")}.search .search__submit.search__submit--close{background-image:url("../assets/images/icons/remove.svg");background-size:16px}.u-animation--spin{animation:spin 1s infinite linear !important}.u-animation--pulse{animation:pulse 1s ease-out !important;animation-iteration-count:infinite !important;opacity:0}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}@keyframes pulse{0%{transform:scale(0.1, 0.1);opacity:0}50%{opacity:1}100%{transform:scale(1.2, 1.2);opacity:0}}.u-border{border:1px dotted #cdcdcd !important}.u-border--top{border-top:1px dotted #cdcdcd !important}.u-border--right{border-right:1px dotted #cdcdcd !important}.u-border--bottom{border-bottom:1px dotted #cdcdcd !important}.u-border--left{border-left:1px dotted #cdcdcd !important}.u-border--dotted{border-style:dotted !important}.u-border--solid{border-style:solid !important}.u-border--dashed{border-style:dashed !important}.u-border--none{border:0 !important}.u-align--right{text-align:right !important}.u-align--left{text-align:left !important}.u-align--center{text-align:center !important}.u-position--relative{position:relative !important}.u-position--fixed{position:fixed !important}.u-position--absolute{position:absolute !important}.u-float--right{float:right !important}.u-float--left{float:left !important}.u-float--none{float:none !important}.u-muted{opacity:.5 !important;filter:alpha(opacity=50) !important}.u-clear{clear:both !important}.u-display--block{display:block !important}.u-display--inline{display:inline !important}.u-display--inline-block{display:inline-block !important}.u-display--hidden{display:none !important}.u-width--full{width:100% !important}.u-width--half{width:50% !important}.u-width--third{width:calc(100%/3) !important}.u-width--quater{width:25% !important}.u-margin{margin:20px}.u-margin--none{margin:0 !important}.u-margin--tiny{margin:5px !important}.u-margin--small{margin:10px !important}.u-margin--medium{margin:30px !important}.u-margin--large{margin:40px !important}.u-margin--huge{margin:80px !important}.u-margin--top{margin-top:20px !important}.u-margin--top-none{margin-top:0 !important}.u-margin--top-tiny{margin-top:5px !important}.u-margin--top-small{margin-top:10px !important}.u-margin--top-medium{margin-top:30px !important}.u-margin--top-large{margin-top:40px !important}.u-margin--top-huge{margin-top:80px !important}.u-margin--right{margin-right:20px !important}.u-margin--right-none{margin-right:0 !important}.u-margin--right-tiny{margin-right:5px !important}.u-margin--right-small{margin-right:10px !important}.u-margin--right-medium{margin-right:30px !important}.u-margin--right-large{margin-right:40px !important}.u-margin--right-huge{margin-right:80px !important}.u-margin--bottom{margin-bottom:20px !important}.u-margin--bottom-none{margin-bottom:0 !important}.u-margin--bottom-tiny{margin-bottom:5px !important}.u-margin--bottom-small{margin-bottom:10px !important}.u-margin--bottom-medium{margin-bottom:30px !important}.u-margin--bottom-large{margin-bottom:40px !important}.u-margin--bottom-huge{margin-bottom:80px !important}.u-margin--left{margin-left:20px !important}.u-margin--left-none{margin-left:0 !important}.u-margin--left-tiny{margin-left:5px !important}.u-margin--left-small{margin-left:10px !important}.u-margin--left-medium{margin-left:30px !important}.u-margin--left-large{margin-left:40px !important}.u-margin--left-huge{margin-left:80px !important}.u-padding{padding:20px}.u-padding--none{padding:0 !important}.u-padding--tiny{padding:5px !important}.u-padding--small{padding:10px !important}.u-padding--medium{padding:30px !important}.u-padding--large{padding:40px !important}.u-padding--huge{padding:80px !important}.u-padding--top{padding-top:20px !important}.u-padding--top-none{padding-top:0 !important}.u-padding--top-tiny{padding-top:5px !important}.u-padding--top-small{padding-top:10px !important}.u-padding--top-medium{padding-top:30px !important}.u-padding--top-large{padding-top:40px !important}.u-padding--top-huge{padding-top:80px !important}.u-padding--right{padding-right:20px !important}.u-padding--right-none{padding-right:0 !important}.u-padding--right-tiny{padding-right:5px !important}.u-padding--right-small{padding-right:10px !important}.u-padding--right-medium{padding-right:30px !important}.u-padding--right-large{padding-right:40px !important}.u-padding--right-huge{padding-right:80px !important}.u-padding--bottom{padding-bottom:20px !important}.u-padding--bottom-none{padding-bottom:0 !important}.u-padding--bottom-tiny{padding-bottom:5px !important}.u-padding--bottom-small{padding-bottom:10px !important}.u-padding--bottom-medium{padding-bottom:30px !important}.u-padding--bottom-large{padding-bottom:40px !important}.u-padding--bottom-huge{padding-bottom:80px !important}.u-padding--left{padding-left:20px !important}.u-padding--left-none{padding-left:0 !important}.u-padding--left-tiny{padding-left:5px !important}.u-padding--left-small{padding-left:10px !important}.u-padding--left-medium{padding-left:30px !important}.u-padding--left-large{padding-left:40px !important}.u-padding--left-huge{padding-left:80px !important}.u-text--subtle{color:#888;font-size:.9375rem}.u-text--error{color:#df382c !important}.u-border--error{border-color:#df382c !important}.u-background--error{background-color:#df382c !important}.has-error{border:1px solid #df382c !important}.has-error:focus{border:1px solid #df382c !important}.u-text--off{color:#d2d2d2 !important}.u-border--off{border-color:#d2d2d2 !important}.u-background--off{background-color:#d2d2d2 !important}.has-off{border:1px solid #d2d2d2 !important}.has-off:focus{border:1px solid #d2d2d2 !important}.u-text--warning{color:#eca918 !important}.u-border--warning{border-color:#eca918 !important}.u-background--warning{background-color:#eca918 !important}.has-warning{border:1px solid #eca918 !important}.has-warning:focus{border:1px solid #eca918 !important}.u-text--success{color:#38b44a !important}.u-border--success{border-color:#38b44a !important}.u-background--success{background-color:#38b44a !important}.has-success{border:1px solid #38b44a !important}.has-success:focus{border:1px solid #38b44a !important}.u-text--on{color:#38b44a !important}.u-border--on{border-color:#38b44a !important}.u-background--on{background-color:#38b44a !important}.has-on{border:1px solid #38b44a !important}.has-on:focus{border:1px solid #38b44a !important}.u-text--information{color:#19b6ee !important}.u-border--information{border-color:#19b6ee !important}.u-background--information{background-color:#19b6ee !important}.has-information{border:1px solid #19b6ee !important}.has-information:focus{border:1px solid #19b6ee !important}.u-text--loading{color:#2ab7ec !important}.u-border--loading{border-color:#2ab7ec !important}.u-background--loading{background-color:#2ab7ec !important}.has-loading{border:1px solid #2ab7ec !important}.has-loading:focus{border:1px solid #2ab7ec !important}.u-vertical-align{position:relative;top:50%;transform:translateY(-50%)}.u-text--truncate{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.hidden{display:none}.small-icon{width:12px}.images-info{text-align:center;padding:10px}.images-warning{box-sizing:border-box;border-radius:2px;list-style:none;padding:15px 20px 15px 45px;background-repeat:no-repeat;box-shadow:0 1px 1px rgba(0,0,0,0.1);background:#fff url("../assets/images/icons/error.svg") no-repeat;background-size:16px 16px;background-position:15px center;margin-bottom:20px}#loader{width:10px;margin:16px auto 0 auto}#importing{box-sizing:border-box;border-radius:2px;list-style:none;padding:15px;font-size:16px;margin:0 0 20px;background:#fff;background-position:top 50% left 15px;background-repeat:no-repeat;box-shadow:0 1px 1px rgba(0,0,0,0.1)}#importing .spinner{margin-top:-3px}.spinner{width:16px;height:16px;padding:0;border-bottom:0 !important;display:inline-block;vertical-align:middle;text-indent:999em;background:url("../assets/images/icons/loading.png") no-repeat;background-size:100% 100%}.spin{animation:spin 1s infinite linear !important}.importing-dot{opacity:0;-webkit-animation:dot 1.3s infinite;animation:dot 1.3s infinite}.accounts .logout .divide{padding:0 20px 0 30px;display:inline-block}.accounts .api li{position:relative}.accounts .api li input[type='text']{line-height:30px;padding-right:30px;width:100%}.accounts .api li input[type='text']::-webkit-input-placeholder{color:#333}.accounts .api li input[type='text']:-moz-placeholder{color:#333}.accounts .api li input[type='text']::-moz-placeholder{color:#333}.accounts .api li input[type='text']:-ms-input-placeholder{color:#333}.accounts .api li .delete-link{position:absolute;top:13px;right:15px}.script-content{width:100%;overflow:hidden}.script-content .content{margin:20px 0 0}

=== renamed file 'src/maasserver/static/css/build.css' => 'src/maasserver/static/css/build.css.moved'
=== modified file 'src/maasserver/static/js/angular/controllers/dashboard.js'
=== modified file 'src/maasserver/static/js/angular/controllers/node_details.js'
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_dashboard.js'
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-04-20 08:58:42 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-04-25 09:34:40 +0000
@@ -1039,46 +1039,89 @@
                 });
         });
 
-        it("calls performAction with hwe kernel", function() {
-            var controller = makeController();
-            spyOn(MachinesManager, "performAction").and.returnValue(
-                $q.defer().promise);
-            $scope.node = node;
-            $scope.action.option = {
-                name: "deploy"
-            };
-            $scope.osSelection.osystem = "ubuntu";
-            $scope.osSelection.release = "ubuntu/xenial";
-            $scope.osSelection.hwe_kernel = "hwe-16.04-edge";
-            $scope.actionGo();
-            expect(MachinesManager.performAction).toHaveBeenCalledWith(
-                node, "deploy", {
-                    osystem: "ubuntu",
-                    distro_series: "xenial",
-                    hwe_kernel: "hwe-16.04-edge"
-                });
-        });
-
-        it("calls performAction with ga kernel", function() {
-            var controller = makeController();
-            spyOn(MachinesManager, "performAction").and.returnValue(
-                $q.defer().promise);
-            $scope.node = node;
-            $scope.action.option = {
-                name: "deploy"
-            };
-            $scope.osSelection.osystem = "ubuntu";
-            $scope.osSelection.release = "ubuntu/xenial";
-            $scope.osSelection.hwe_kernel = "ga-16.04";
-            $scope.actionGo();
-            expect(MachinesManager.performAction).toHaveBeenCalledWith(
-                node, "deploy", {
-                    osystem: "ubuntu",
-                    distro_series: "xenial",
-                    hwe_kernel: "ga-16.04"
-                });
-        });
-
+<<<<<<< TREE
+        it("calls performAction with hwe kernel", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.action.option = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "ubuntu";
+            $scope.osSelection.release = "ubuntu/xenial";
+            $scope.osSelection.hwe_kernel = "hwe-16.04-edge";
+            $scope.actionGo();
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "xenial",
+                    hwe_kernel: "hwe-16.04-edge"
+                });
+        });
+
+        it("calls performAction with ga kernel", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.action.option = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "ubuntu";
+            $scope.osSelection.release = "ubuntu/xenial";
+            $scope.osSelection.hwe_kernel = "ga-16.04";
+            $scope.actionGo();
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "xenial",
+                    hwe_kernel: "ga-16.04"
+                });
+        });
+
+=======
+        it("calls performAction with hwe kernel", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.actionOption = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "ubuntu";
+            $scope.osSelection.release = "ubuntu/xenial";
+            $scope.osSelection.hwe_kernel = "hwe-16.04-edge";
+            $scope.actionGo();
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "xenial",
+                    hwe_kernel: "hwe-16.04-edge"
+                });
+        });
+
+        it("calls performAction with ga kernel", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.actionOption = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "ubuntu";
+            $scope.osSelection.release = "ubuntu/xenial";
+            $scope.osSelection.hwe_kernel = "ga-16.04";
+            $scope.actionGo();
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "xenial",
+                    hwe_kernel: "ga-16.04"
+                });
+        });
+
+>>>>>>> MERGE-SOURCE
         it("calls performAction with commissionOptions", function() {
             var controller = makeController();
             spyOn(MachinesManager, "performAction").and.returnValue(

=== modified file 'src/maasserver/static/js/angular/directives/boot_images.js'
=== modified file 'src/maasserver/static/js/angular/directives/error_overlay.js'
=== modified file 'src/maasserver/static/js/angular/directives/maas_obj_form.js'
=== modified file 'src/maasserver/static/js/angular/directives/tests/test_boot_images.js'
=== modified file 'src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js'
=== modified file 'src/maasserver/static/js/angular/maas.js'
--- src/maasserver/static/js/angular/maas.js	2017-03-10 18:38:46 +0000
+++ src/maasserver/static/js/angular/maas.js	2017-04-25 09:34:40 +0000
@@ -8,8 +8,13 @@
  * conflicts with Django templates.
  */
 
+<<<<<<< TREE
 angular.module('MAAS',
     ['ngRoute', 'ngCookies', 'ngSanitize', 'ngTagsInput', 'sticky']).config(
+=======
+angular.module('MAAS',
+    ['ngRoute', 'ngCookies', 'ngTagsInput', 'sticky']).config(
+>>>>>>> MERGE-SOURCE
     function($interpolateProvider, $routeProvider, $httpProvider) {
         $interpolateProvider.startSymbol('{$');
         $interpolateProvider.endSymbol('$}');

=== modified file 'src/maasserver/static/partials/boot-images.html'
=== modified file 'src/maasserver/static/partials/dashboard.html'
--- src/maasserver/static/partials/dashboard.html	2017-04-18 10:57:48 +0000
+++ src/maasserver/static/partials/dashboard.html	2017-04-25 09:34:40 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <header class="page-header" sticky media-query="min-width: 769px" window-width>
     <div class="wrapper--inner">
         <h1 class="page-header__title">Device discovery</h1>
@@ -117,8 +118,156 @@
                                                 <dt class="two-col">Subnet</dt>
                                                     <dd class="four-col last-col">{$ getSubnetName(discovery.subnet) $}</dd>
                                             </dl>
+=======
+<div data-ng-hide="loaded">
+    <header class="page-header" sticky>
+        <div class="wrapper--inner">
+            <h1 class="page-header__title">Device discovery</h1>
+            <p class="page-header__status">
+                <span class="u-text--loading"><i class="icon u-margin--right-tiny icon--loading u-animation--spin"></i>Searching network for devices&hellip;</span>
+            </p>
+        </div>
+    </header>
+    <section class="row">
+      <div class="wrapper--inner">
+          <div class="twelve-col">
+              <table>
+                  <thead>
+                      <tr>
+                          <th class="table-col--37">Name</th>
+                          <th class="table-col--15">Mac address</th>
+                          <th class="table-col--13">IP</th>
+                          <th class="table-col--15">Rack</th>
+                          <th class="table-col--20">Last seen</th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                      <tr>
+                          <td colspan="5">
+                              No new discoveries
+                          </td>
+                      </tr>
+                  </tbody>
+              </table>
+          </div>
+      </div>
+    </section>
+</div>
+<div class="ng-hide" data-ng-show="loaded">
+    <header class="page-header" sticky>
+        <div class="wrapper--inner">
+            <h1 class="page-header__title">Device discovery</h1>
+            <p class="page-header__status" >{$ discoveredDevices.length $} items discovered</p>
+            <div class="page-header__controls" data-ng-if="networkDiscovery">
+                <maas-obj-form obj="networkDiscovery" manager="configManager" inline="true">
+                    <maas-obj-field type="onoffswitch" key="value" label="Discovery enabled"
+      on-value="enabled" off-value="disabled" subtle="true" label-left="true"
+      label-info="When enabled, MAAS will use passive techniques, such as listening to&#xa; ARP requests and DNS advertisements, to observe networks attached&#xa; to rack controllers. Active subnet mapping can also be enabled in the&#xa; Device Discovery section of the Settings page."></maas-obj-field>
+                </maas-obj-form>
+            </div>
+          </div>
+    </header>
+    <section class="row">
+        <div class="wrapper--inner">
+            <ul class="flash-messages u-padding--bottom" data-ng-if="networkDiscovery.value === 'disabled'">
+                <li class="flash-messages__item flash-messages__item--warning">List of devices will not update as discovery is turned off</li>
+            </ul>
+            <div class="twelve-col">
+                <div class="table" >
+                    <header class="table__head" sticky sticky-class="table__head--sticky" offset="116">
+                        <div class="table__row">
+                            <div class="table__header table-col--37">Name</div>
+                            <div class="table__header table-col--15">Mac address</div>
+                            <div class="table__header table-col--13">IP</div>
+                            <div class="table__header table-col--15">Rack</div>
+                            <div class="table__header table-col--20">Last seen</div>
+                        </div>
+                    </header>
+                    <div class="table__body">
+                        <div class="table__row table--success" data-ng-if="convertTo.saved">
+                            <div class="table__data table-col--97">
+                                <i class="icon icon--success"></i> {$ convertTo.hostname $} has been add to {$ site $}.
+                                <a href="#/node/{$ convertTo.parent $}" data-ng-if="convertTo.parent">Go to the machine devices page.</a>
+                                <a href="#/nodes/?tab=devices" data-ng-if="!convertTo.parent">Go to the device listing.</a>
+                            </div>
+                            <div class="table__data table-col--3">
+                                <i class="icon icon--cross tooltip" aria-label="Clear"
+                                    data-ng-click="convertTo.saved = false">Clear</i>
+                            </div>
+                        </div>
+                        <div class="table__row" data-ng-if="!discoveredDevices.length">
+                            <div class="table__data table-col--100">
+                                No new discoveries
+                            </div>
+                        </div>
+                        <div class="table__row"
+                            data-ng-repeat="discovery in discoveredDevices | orderBy:'-last_seen' track by discovery.first_seen"
+                            data-ng-class="{'is-active' : discovery.first_seen === selectedDevice}">
+                            <div data-ng-if="discovery.first_seen !== selectedDevice"
+                                data-ng-dblclick="toggleSelected(discovery.first_seen)">
+                                <div class="table__data table-col--37">
+                                    {$ getDiscoveryName(discovery) $}
+                                    <i data-ng-show="discovery.is_external_dhcp === true" class="icon icon--info tooltip u-margin--left-tiny ng-hide" aria-label="This device is providing DHCP."></i>
+                                </div>
+                                <div class="table__data table-col--15">
+                                    {$ discovery.mac_address $}<br/>
+                                    <small class="u-text--subtle">{$ discovery.mac_organization || 'Unknown' $}</small>
+                                </div>
+                                <div class="table__data table-col--13 u-text--truncate">
+                                    {$ discovery.ip $}
+                                </div>
+                                <div class="table__data table-col--15">
+                                    {$ discovery.observer_hostname $}
+                                </div>
+                                <div class="table__data table-col--17">
+                                    <time>{$ discovery.last_seen $}</time>
+                                </div>
+                                <div class="table__data table-col--3">
+                                    <i class="icon icon--open tooltip" aria-label="Open"
+                                        data-ng-click="toggleSelected(discovery.first_seen)">Open</i>
+                                </div>
+                            </div>
+                            <maas-obj-form data-ng-if="discovery.first_seen === selectedDevice"
+                                obj="convertTo" manager="proxyManager" pre-process="preProcess"
+                                after-save="afterSave" table-form="true" save-on-blur="false">
+                                <div class="table__data table-col--20">
+                                    <maas-obj-field class="u-margin--bottom-none" type="text" key="hostname"
+                                        disable-label="true" placeholder="Hostname (optional)"></maas-obj-field>
+                                </div>
+                                <div class="table__data table-col--77"></div>
+                                <div class="table__data table-col--3">
+                                    <i class="icon icon--close tooltip" aria-label="Close"
+                                        data-ng-click="toggleSelected(discovery.first_seen)">Close</i>
+                                </div>
+                                <div class="table__dropdown">
+                                    <div class="table__row is-active">
+                                        <div class="table__data table-col--100">
+                                            <div class="six-col">
+                                                <dl>
+                                                    <dt class="two-col">Mac</dt>
+                                                        <dd class="four-col last-col">{$ discovery.mac_address $}</dd>
+                                                    <dt class="two-col">IP</dt>
+                                                        <dd class="four-col last-col">{$ discovery.ip $}</dd>
+                                                    <dt class="two-col">Rack</dt>
+                                                        <dd class="four-col last-col">{$ discovery.observer_hostname $}</dd>
+                                                    <dt class="two-col">Last seen</dt>
+                                                        <dd class="four-col last-col"><time>{$ discovery.last_seen $}</time></dd>
+                                                </dl>
+                                            </div>
+                                            <div class="six-col last-col">
+                                                <dl>
+                                                    <dt class="two-col">Fabric</dt>
+                                                        <dd class="four-col last-col">{$ discovery.fabric_name $}</dd>
+                                                    <dt class="two-col">VLAN</dt>
+                                                        <dd class="four-col last-col">{$ getVLANName(discovery.vlan) $}</dd>
+                                                    <dt class="two-col">Subnet</dt>
+                                                        <dd class="four-col last-col">{$ getSubnetName(discovery.subnet) $}</dd>
+                                                </dl>
+                                            </div>
+>>>>>>> MERGE-SOURCE
                                         </div>
                                     </div>
+<<<<<<< TREE
                                 </div>
                                 <div class="table__row is-active u-padding--top-small">
                                     <div class="table__data table-col--100">
@@ -138,7 +287,22 @@
                                                         <option value="device">Device</option>
                                                         <option value="interface">Interface</option>
                                                     </select>
+=======
+                                    <div class="table__row is-active u-padding--top-small">
+                                        <div class="table__data table-col--100">
+                                            <fieldset class="form__fieldset six-col">
+                                                <div class="form__group">
+                                                    <label class="form__group-label two-col u-margin--bottom-small">Type</label>
+                                                    <div class="form__group-input three-col">
+                                                        <select name="type" ng-model="convertTo.type">
+                                                            <option value="" disabled>Choose type</option>
+                                                            <option value="device">Device</option>
+                                                            <option value="interface">Interface</option>
+                                                        </select>
+                                                    </div>
+>>>>>>> MERGE-SOURCE
                                                 </div>
+<<<<<<< TREE
                                             </div>
                                             <maas-obj-field type="options" key="domain" label="Domain" placeholder="Choose domain"
                                                 label-width="two" input-width="three" subtle="false"
@@ -178,9 +342,55 @@
                                 </div>
                             </div>
                         </maas-obj-form>
+=======
+                                                <maas-obj-field type="options" key="domain" label="Domain" placeholder="Choose domain"
+                                                    label-width="two" input-width="three" subtle="false"
+                                                    options="domain as domain.name for domain in domains"
+                                                    data-ng-if="convertTo.type === 'device'"></maas-obj-field>
+                                                <maas-obj-field type="options" subtle="false" key="system_id" label="Device name" placeholder="Select device name"
+                                                    options="device.system_id as device.fqdn for device in devices | orderBy:'fqdn'"
+                                                    label-width="two" label-info="Create as an interface on the selected device." input-width="three"
+                                                    data-ng-if="convertTo.type === 'interface'"></maas-obj-field>
+                                            </fieldset>
+                                            <fieldset class="form__fieldset six-col last-col">
+                                                <maas-obj-field type="options" subtle="false" key="parent" label="Parent" placeholder="Select parent (optional)" placeholder-enabled="true"
+                                                    options="machine.system_id as machine.fqdn for machine in machines | filter:{status_code: 6} | orderBy:'fqdn'"
+                                                    label-width="two" label-info="Assign this device as a child of the parent machine." input-width="three"
+                                                    data-ng-if="convertTo.type === 'device'"></maas-obj-field>
+                                                <maas-obj-field type="options" subtle="false" key="ip_assignment" label="IP assignment" placeholder="Select IP assignment"
+                                                    options="option[0] as option[1] for option in convertTo.deviceIPOptions" label-width="two" input-width="three"></maas-obj-field>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                    <div class="table__row is-active">
+                                        <div class="table__data u-float--left">
+                                            <maas-obj-errors></maas-obj-errors>
+                                        </div>
+                                        <div class="table__data u-float--right">
+                                            <a class="button--base button--inline" data-ng-click="toggleSelected(selectedDevice)">Cancel</a>
+                                            <button class="button--secondary button--inline"
+                                                data-ng-click="convertTo.goTo = true"
+                                                data-ng-if="!convertTo.$maasForm.getValue('parent')"
+                                                maas-obj-save>Save and go to device listing</button>
+                                            <button class="button--secondary button--inline"
+                                                data-ng-click="convertTo.goTo = true"
+                                                data-ng-if="convertTo.$maasForm.getValue('parent')"
+                                                maas-obj-save>Save and go to machine details</button>
+                                            <button class="button--primary button--inline" maas-obj-save>Save</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </maas-obj-form>
+                        </div>
+>>>>>>> MERGE-SOURCE
                     </div>
                 </div>
             </div>
         </div>
+<<<<<<< TREE
     </div>
 </div>
+=======
+    </section>
+</div>
+>>>>>>> MERGE-SOURCE

=== modified file 'src/maasserver/static/partials/domain-details.html'
--- src/maasserver/static/partials/domain-details.html	2017-03-27 13:09:56 +0000
+++ src/maasserver/static/partials/domain-details.html	2017-04-25 09:34:40 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
     <div class="wrapper--inner">
         <h1 class="page-header__title">
             {$ domain.displayname $}:

=== modified file 'src/maasserver/static/partials/domains-list.html'
--- src/maasserver/static/partials/domains-list.html	2017-04-04 13:24:28 +0000
+++ src/maasserver/static/partials/domains-list.html	2017-04-25 09:34:40 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
     <div class="wrapper--inner">
         <h1 class="page-header__title">DNS</h1>
         <p class="page-header__status" data-ng-show="loading"><span class="u-text--loading"><i class="icon icon--loading u-animation--spin"></i> Loading...</span></p>

=== modified file 'src/maasserver/static/partials/error.html'
--- src/maasserver/static/partials/error.html	2017-01-28 00:51:47 +0000
+++ src/maasserver/static/partials/error.html	2017-04-25 09:34:40 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
     <div class="wrapper--inner">
         <h1 class="page-header__title">Error</h1>
         <div class="page-header__controls">

=== modified file 'src/maasserver/static/partials/fabric-details.html'
--- src/maasserver/static/partials/fabric-details.html	2017-03-27 13:09:56 +0000
+++ src/maasserver/static/partials/fabric-details.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,20 @@
 <div data-ng-hide="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
 <div class="ng-hide" data-ng-show="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">{$ fabric.name $}</h1>
             <div class="page-header__controls ng-hide" data-ng-show="isSuperUser() && !isDefaultFabric() && !loading">

=== modified file 'src/maasserver/static/partials/images.html'
=== modified file 'src/maasserver/static/partials/intro-user.html'
--- src/maasserver/static/partials/intro-user.html	2017-02-17 14:23:04 +0000
+++ src/maasserver/static/partials/intro-user.html	2017-04-25 09:34:40 +0000
@@ -1,4 +1,5 @@
 <div class="row" data-ng-if="!loading">
+<<<<<<< TREE
     <div class="wrapper--inner">
         <div class="twelve-col">
             <div class="action-card">
@@ -29,5 +30,37 @@
                 data-ng-disabled="!canContinue()"
                 data-ng-click="clickContinue()">Go to dashboard</button>
         </div>
+=======
+    <div class="wrapper--inner">
+        <div class="twelve-col">
+            <div class="action-card">
+                <h2 class="action-card__title">
+                    <i class="icon icon--large u-margin--right-tiny"
+                        data-ng-class="{'icon--success': canContinue(), 'icon--success-grey': !canContinue()}"></i>
+                    SSH keys for {$ user.username $}
+                </h2>
+                <div class="action-card__controls">
+                    <p class="u-margin--top">Add multiple keys from Launchpad and Github or enter them manually.</p>
+                    <h3>Keys</h3>
+                    <maas-ssh-keys></maas-ssh-keys>
+                </div>
+            </div>
+            <div class="action-card"
+                data-ng-if="isSuperUser()"
+                data-ng-class="{'u-muted': !canContinue()}">
+                <h2 class="action-card__title">
+                    MAAS has been successfully set up
+                </h2>
+                <div class="action-card__controls">
+                    <p class="u-margin--top"><i class="icon icon--success u-margin--right-small"></i>Once DHCP is enabled, set your machines to PXE boot and they will be automatically enlisted in the Nodes tab.</p>
+                    <p class="u-margin--top"><i class="icon icon--success u-margin--right-small"></i>Discovered MAC/IP pairs in your network will be listed on your dashboard and can be added to MAAS.</p>
+                    <p class="u-margin--top u-margin--bottom"><i class="icon icon--success u-margin--right-small"></i>The fabrics, VLANs and subnets in your network will be automatically added to MAAS in Networks.</p>
+                </div>
+            </div>
+            <button class="button button--primary button--large"
+                data-ng-disabled="!canContinue()"
+                data-ng-click="clickContinue()">Go to dashboard</button>
+        </div>
+>>>>>>> MERGE-SOURCE
     </div>
 </div>

=== modified file 'src/maasserver/static/partials/intro.html'
--- src/maasserver/static/partials/intro.html	2017-02-17 14:23:04 +0000
+++ src/maasserver/static/partials/intro.html	2017-04-25 09:34:40 +0000
@@ -1,4 +1,5 @@
 <div class="row" data-ng-if="!loading">
+<<<<<<< TREE
     <div class="wrapper--inner">
         <div class="twelve-col-col">
             <div class="action-card">
@@ -67,5 +68,75 @@
                 data-ng-disabled="!canContinue()"
                 data-ng-click="clickContinue()">Continue</button>
         </div>
+=======
+    <div class="wrapper--inner">
+        <div class="twelve-col-col">
+            <div class="action-card">
+                <h2 class="action-card__title">
+                    <i class="icon icon--large u-margin--right-tiny"
+                        data-ng-class="{ 'icon--success': !welcomeInError(), 'icon--error': welcomeInError() }"></i>
+                    Welcome to MAAS
+                </h2>
+                <div class="action-card__controls">
+                    <div class="u-margin--top">
+                        <maas-obj-form obj="maasName" manager="configManager">
+                            <div class="five-col">
+                                <maas-obj-field type="text" key="value" label="Region name" placeholder="e.g. us-west"  subtle="false" blur-on-enter="true"></maas-obj-field>
+                            </div>
+                        </maas-obj-form>
+                    </div>
+                </div>
+            </div>
+            <div class="action-card">
+                <h2 class="action-card__title">
+                    <i class="icon icon--large u-margin--right-tiny"
+                        data-ng-class="{ 'icon--success': !networkInError(), 'icon--error': networkInError() }"></i>
+                    Connectivity
+                </h2>
+                <div class="action-card__controls">
+                    <div class="row u-border--none u-padding--none u-margin--top">
+                        <maas-obj-form obj="upstreamDNS" manager="configManager">
+                            <div class="five-col">
+                                <maas-obj-field type="text" key="value" label="DNS forwarder" placeholder="e.g. 8.8.8.8" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            </div>
+                            <div class="five-col u-padding--top-tiny"></div>
+                            <div class="seven-col last-col u-text--subtle">The address used to resolve domains not managed by MAAS. The value is used as the value of 'forwarders' in the DNS server configuration.</div>
+                        </maas-obj-form>
+                    </div>
+                    <div class="row u-border--none u-padding--none">
+                        <maas-obj-form obj="mainArchive" manager="repoManager">
+                            <div class="five-col">
+                                <maas-obj-field type="text" key="url" label="Ubuntu archive" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            </div>
+                            <div class="five-col u-padding--top-tiny"></div>
+                            <div class="seven-col last-col u-text--subtle">The server where machines retrieve packages for Intel architectures.</div>
+                        </maas-obj-form>
+                    </div>
+                    <div class="row u-border--none u-padding--none">
+                        <maas-obj-form obj="portsArchive" manager="repoManager">
+                            <div class="five-col">
+                                <maas-obj-field type="text" key="url" label="Ubuntu extra architectures" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            </div>
+                            <div class="five-col u-padding--top-tiny"></div>
+                            <div class="seven-col last-col u-text--subtle">Archive used by machines to retrieve packages for non-Intel architectures.</div>
+                        </maas-obj-form>
+                    </div>
+                    <div class="row u-border--none u-padding--none">
+                        <maas-obj-form obj="httpProxy" manager="configManager">
+                            <div class="five-col">
+                                <maas-obj-field type="text" key="value" label="APT &amp; HTTP/HTTPS proxy server" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            </div>
+                            <div class="five-col u-padding--top-tiny"></div>
+                            <div class="seven-col last-col u-text--subtle">This will be passed onto deployed machines to use as a proxy for APT traffic. MAAS also uses the proxy for downloading boot images. In no URL is provided, the build-in MAAS proxy will be used.</div>
+                        </maas-obj-form>
+                    </div>
+                </div>
+            </div>
+            <maas-boot-images design="'action-card'"></maas-boot-images>
+            <button class="button button--primary button--large"
+                data-ng-disabled="!canContinue()"
+                data-ng-click="clickContinue()">Continue</button>
+        </div>
+>>>>>>> MERGE-SOURCE
     </div>
 </div>

=== modified file 'src/maasserver/static/partials/networks-list.html'
--- src/maasserver/static/partials/networks-list.html	2017-04-10 15:35:18 +0000
+++ src/maasserver/static/partials/networks-list.html	2017-04-25 09:34:40 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
     <div class="wrapper--inner">
         <h1 class="page-header__title">Subnets</h1>
         <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2017-04-20 08:58:42 +0000
+++ src/maasserver/static/partials/node-details.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,22 @@
+<<<<<<< TREE
 <div data-ng-if="!loaded">
     <header class="page-header">
+=======
+<div data-ng-hide="loaded">
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
+<<<<<<< TREE
 <div data-ng-if="loaded">
     <header sticky use-placeholder="true" media-query="min-width: 769px" class="page-header u-margin--bottom-none">
+=======
+<div class="ng-hide" data-ng-show="loaded">
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">
                 <span contenteditable="true"
@@ -45,6 +55,7 @@
             </div>
 
             <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+<<<<<<< TREE
              <div class="page-header__dropdown" data-ng-class="{ 'is-open': action.option }">
                  <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-if="!isDevice && !node.dhcp_on">
                        <p class="page-header__message page-header__message--warning">MAAS is not providing DHCP.</p>
@@ -221,6 +232,97 @@
                     data-ng-class="{ 'is-active': section.area === 'power'}"
                     data-ng-click="section.area = 'power'">Power</button>
             </nav>
+=======
+            <div class="page-header__dropdown" data-ng-class="{ 'is-open': actionOption }">
+
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="!node.dhcp_on">
+	            <p class="page-header__message page-header__message--warning">
+                        MAAS is not providing DHCP.
+		    </p>
+                </div>
+
+                <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(actionOption.name)">
+                    <form class="form form--inline">
+                        <fieldset class="form__fieldset ng-hide" data-ng-show="actionOption.name === 'commission'">
+                            <div class="form__group">
+                                <input class="checkbox" id="enableSSH" type="checkbox"
+                                    data-ng-model="commissionOptions.enableSSH">
+                                <label for="enableSSH">Allow SSH access and prevent machine from powering off</label>
+                            </div>
+                            <div class="form__group">
+                                <input class="checkbox" id="skipNetworking" type="checkbox"
+                                    data-ng-model="commissionOptions.skipNetworking">
+                                <label for="skipNetworking">Retain network configuration</label>
+                            </div>
+                            <div class="form__group">
+                                <input class="checkbox" id="skipStorage" type="checkbox"
+                                    data-ng-model="commissionOptions.skipStorage">
+                                <label for="skipStorage">Retain storage configuration</label>
+                            </div>
+                        </fieldset>
+                        <fieldset class="form__fieldset ng-hide" data-ng-show="actionOption.name === 'deploy'">
+                            <div class="form__group">
+                                <label for="image" class="form__group-label">Choose your image</label>
+                                <div class="form__group-input">
+                                    <span data-maas-os-select="osinfo" data-ng-model="osSelection"></span>
+                                </div>
+                            </div>
+                        </fieldset>
+                        <fieldset class="form__fieldset" data-ng-if="actionOption.name === 'release'">
+                            <div class="form__group">
+                                <span data-maas-release-options="releaseOptions"></span>
+                            </div>
+                        </fieldset>
+                        <div class="page-header__controls">
+                            <a href="" class="button--base button--inline" data-ng-click="actionCancel()">Cancel</a>
+                            <button class="button--primary button--inline" data-ng-click="actionGo()">Go</button>
+                        </div>
+                    </form>
+                </div>
+
+                <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError()">
+                    <p class="page-header__message page-header__message--error">
+                        Node failed to be {$ actionOption.sentence $}, because of the following error: {$ actionError $}
+                    </p>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel()">Cancel</a>
+                        <button class="button--primary button--inline" data-ng-click="actionGo()">Retry</button>
+                    </div>
+                </div>
+
+                <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isDeployError()">
+                    <p class="page-header__message page-header__message--error">
+                        Node cannot be {$ actionOption.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="images/">images page</a>.
+                    </p>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel()">Cancel</a>
+                    </div>
+                </div>
+
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionPowerError(actionOption.name)">
+                    <p class="page-header__message page-header__message--error">
+                        Node cannot be {$ actionOption.sentence $}, because power control software for the
+                        node is missing from its rack controller. To proceed, install the
+                        {$ getPowerErrors() $} on the rack controller.
+                    </p>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel()">Cancel</a>
+                    </div>
+                </div>
+
+                <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isSSHKeyError()">
+                    <p class="page-header__message page-header__message--error">
+                        Node cannot be {$ actionOption.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.
+                    </p>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel()">Cancel</a>
+                    </div>
+                </div>
+            </div>
+>>>>>>> MERGE-SOURCE
         </div>
     </div>
     <section class="row" data-ng-if="section.area === 'summary'">

=== modified file 'src/maasserver/static/partials/node-events.html'
--- src/maasserver/static/partials/node-events.html	2017-04-05 02:36:06 +0000
+++ src/maasserver/static/partials/node-events.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,20 @@
 <div data-ng-hide="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
 <div class="ng-hide" data-ng-show="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky>
+=======
+    <header class="page-header u-margin--bottom" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">{$ node.fqdn $}</h1>
             <p class="page-header__status">
@@ -27,8 +35,13 @@
                         class="search__input" data-ng-model="search" />
                     <input type="submit" class="search__submit" />
                 </div>
+<<<<<<< TREE
                 <table id="events-listing" window-width>
                     <thead data-ng-if="windowWidth >= 769" sticky sticky-class="table__head--sticky" offset="88" media-query="min-width: 768px">
+=======
+                <table id="events-listing">
+                    <thead sticky use-placeholder="false" sticky-class="table__head--sticky" offset="116">
+>>>>>>> MERGE-SOURCE
                         <tr>
                             <th class="table-col--1"></th>
                             <th class="table-col--79">Event</th>

=== modified file 'src/maasserver/static/partials/node-result.html'
--- src/maasserver/static/partials/node-result.html	2017-04-06 16:11:44 +0000
+++ src/maasserver/static/partials/node-result.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,20 @@
 <div data-ng-hide="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
 <div class="ng-hide" data-ng-show="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">{$ node.fqdn $}</h1>
             <p class="page-header__status">{$ filename $}</p>

=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html	2017-04-13 10:43:13 +0000
+++ src/maasserver/static/partials/nodes-list.html	2017-04-25 09:34:40 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <header class="page-header u-margin--bottom-none" sticky media-query="min-width: 769px">
     <div class="wrapper--inner">
         <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
@@ -941,3 +942,914 @@
         </div>
     </div>
 </div>
+=======
+<header class="page-header" sticky>
+    <div class="wrapper--inner">
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <h1 class="page-header__title">{$ $parent.site $} MAAS</h1>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <ul class="tabs">
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <li class="tabs__tab"
+                data-ng-class="{ 'is-active': currentpage === 'nodes' }">
+                <a href=""
+                    class="tabs__tab-link tooltip"
+                    aria-label="A deployable node managed by MAAS."
+                    data-ng-click="toggleTab('nodes')">
+                    {$ nodes.length $} <ng-pluralize count="nodes.length" when="{'one': 'Machine', 'other': 'Machines'}"></ng-pluralize>
+                </a>
+            </li>
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <li class="tabs__tab" data-ng-class="{ 'is-active': currentpage === 'devices' }">
+                <a href=""
+                    class="tabs__tab-link tooltip"
+                    aria-label="A node known to MAAS, but is not deployable."
+                    data-ng-click="toggleTab('devices')">
+                    {$ devices.length $} <ng-pluralize count="devices.length" when="{'one': 'Device', 'other': 'Devices'}"></ng-pluralize>
+                </a>
+            </li>
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <li class="tabs__tab" data-ng-if="isSuperUser()"
+                data-ng-class="{ 'is-active': currentpage === 'controllers' }">
+                <a href=""
+                    class="tabs__tab-link tooltip"
+                    aria-label="A node that provides MAAS services."
+                    data-ng-click="toggleTab('controllers')">
+                    {$ controllers.length $} <ng-pluralize count="controllers.length" when="{'one': 'Controller', 'other': 'Controllers'}"></ng-pluralize>
+                </a>
+            </li>
+        </ul>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <p class="page-header__status" data-ng-show="loading"><span class="u-text--loading"><i class="icon icon--loading u-animation--spin"></i> Loading...</span></p>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__controls u-float--right" data-ng-show="currentpage === 'nodes'">
+            <div data-ng-hide="tabs.nodes.selectedItems.length">
+                <div data-maas-cta="addHardwareOptions"
+                    data-ng-model="addHardwareOption"
+                    data-ng-change="addHardwareOptionChanged()" data-default-title="Add hardware">
+                </div>
+            </div>
+            <div class="ng-hide" data-ng-show="tabs.nodes.selectedItems.length">
+                <span class="page-header__controls-feedback u-margin--right" data-ng-click="showSelected('nodes')">
+                    {$ tabs.nodes.selectedItems.length $} Selected
+                </span>
+                <div data-maas-cta="tabs.nodes.takeActionOptions"
+                    data-ng-model="tabs.nodes.actionOption"
+                    data-ng-change="actionOptionSelected('nodes')">
+                </div>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__controls u-float--right" data-ng-show="currentpage === 'devices'">
+            <div data-ng-hide="tabs.devices.selectedItems.length">
+                <button class="button--primary button--inline"
+                    data-ng-click="addDevice()"
+                    data-ng-hide="addDeviceScope.viewable">Add Device</button>
+                <button class="button--secondary button--inline ng-hide"
+                    data-ng-click="cancelAddDevice()"
+                    data-ng-show="addDeviceScope.viewable">Cancel add device</button>
+            </div>
+            <div data-ng-show="tabs.devices.selectedItems.length">
+                <span class="page-header__controls-feedback u-margin--right" data-ng-click="showSelected('devices')">
+                    {$ tabs.devices.selectedItems.length $} Selected
+                </span>
+                <div data-maas-cta="tabs.devices.takeActionOptions"
+                    data-ng-model="tabs.devices.actionOption"
+                    data-ng-change="actionOptionSelected('devices')">
+                </div>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__controls u-float--right" data-ng-show="currentpage === 'controllers'">
+            <div data-ng-if="!tabs.controllers.selectedItems.length">
+                <button class="button--primary button--inline"
+                    data-ng-click="tabs.controllers.addController = true"
+                    data-ng-hide="tabs.controllers.addController">Add rack controller</button>
+                <button class="button--secondary button--inline ng-hide"
+                    data-ng-click="tabs.controllers.addController = false"
+                        data-ng-show="tabs.controllers.addController">Close add rack controller</button>
+            </div>
+            <div data-ng-show="tabs.controllers.selectedItems.length">
+                <span class="page-header__controls-feedback u-margin--right" data-ng-click="showSelected('controllers')">
+                    {$ tabs.controllers.selectedItems.length $} Selected
+                </span>
+                <div data-maas-cta="tabs.controllers.takeActionOptions"
+                    data-ng-model="tabs.controllers.actionOption"
+                    data-ng-change="actionOptionSelected('controllers')">
+                </div>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.nodes.actionOption }">
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError('nodes') || hasActionsInProgress('nodes')">
+                <form class="form form--inline">
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
+                        <div class="form__group">
+                            <input class="form__group-label" id="enableSSH" type="checkbox"
+                                data-ng-model="tabs.nodes.commissionOptions.enableSSH">
+                            <label class="checkbox-label" for="enableSSH">Allow SSH access and prevent machine from powering off</label>
+                        </div>
+                        <div class="form__group">
+                            <input class="form__group-label" id="skipNetworking" type="checkbox"
+                                data-ng-model="tabs.nodes.commissionOptions.skipNetworking">
+                            <label class="checkbox-label" for="skipNetworking">Retain network configuration</label>
+                        </div>
+                        <div class="form__group">
+                            <input class="form__group-label" id="skipStorage" type="checkbox"
+                                data-ng-model="tabs.nodes.commissionOptions.skipStorage">
+                            <label class="checkbox-label" for="skipStorage">Retain storage configuration</label>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
+                        <div class="form__group">
+                            <label for="image" class="form__group-label">Choose your image</label>
+                            <div class="form__group-input">
+                                <span data-maas-os-select="osinfo" data-ng-model="tabs.nodes.osSelection"></span>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset" data-ng-if="tabs.nodes.actionOption.name === 'release'">
+                        <div class="form__group">
+                            <span data-maas-release-options="tabs.nodes.releaseOptions"></span>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
+                        <div class="form__group">
+                            <label for="zone" class="form__group-label">Select Zone</label>
+                            <div class="form__group-input">
+                                <select name="zone" id="zone" placeholder="Choose a zone"
+                                    data-ng-model="tabs.nodes.zoneSelection"
+                                    data-ng-options="zone as zone.name for zone in zones">
+                                    <option value="" disabled="disabled">Choose a zone</option>
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel('nodes')">Cancel</a>
+                        <button class="button--primary button--inline" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">Go</button>
+                        <button class="button--primary button--inline" data-ng-click="actionGo('nodes')" data-ng-show="hasActionsFailed('nodes')">Retry</button>
+                    </div>
+                </form>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError('nodes')">
+                <p data-ng-hide="isDeployError('nodes') || isSSHKeyError('nodes')"
+                   class="page-header__message page-header__message--error ng-hide">
+                   {$ tabs.nodes.actionErrorCount $}
+                   <span data-ng-pluralize count="tabs.nodes.selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                   cannot be {$ tabs.nodes.actionOption.sentence $}. To proceed, update your selection.
+                </p>
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="isDeployError('nodes')">
+                    {$ tabs.nodes.selectedItems.length $}
+                    <span data-ng-pluralize count="tabs.nodes.selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                    cannot be {$ tabs.nodes.actionOption.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="#/images">images page</a>.
+                </p>
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="isSSHKeyError('nodes')">
+                    {$ tabs.nodes.selectedItems.length $}
+                    <span data-ng-pluralize count="tabs.nodes.selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                    cannot be {$ tabs.nodes.actionOption.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.
+                </p>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionsInProgress('nodes') || hasActionsFailed('nodes')">
+                <p class="page-header__message" data-ng-show="hasActionsInProgress('nodes')">
+                    <i class="icon icon--loading u-animation--spin"></i>
+                    {$ tabs.nodes.actionProgress.completed $} of {$ tabs.nodes.actionProgress.total $}
+                    nodes are transitioning to {$ tabs.nodes.actionOption.sentence $}.
+                </p>
+                <p class="page-header__message page-header__message--error"
+                   data-ng-repeat="(error, nodes) in tabs.nodes.actionProgress.errors">
+                    The {$ tabs.nodes.actionOption.title.toLowerCase() $} action for {$ nodes.length $}
+                    <span data-ng-pluralize count="nodes.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                    failed with error: {$ error $}
+                </p>
+            </section>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': addHardwareScope.viewable }" data-ng-controller="AddHardwareController">
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showMachine()">
+                <h3 class="page-header__dropdown-title">Add machine</h3>
+                <form class="form form--stack">
+                    <fieldset class="form__fieldset six-col">
+                        <div class="form__group">
+                            <label for="machine-name" class="form__label two-col">Machine name</label>
+                            <div class="form__group-input three-col">
+                                <input type="text" id="machine-name" placeholder="Choose a machine name (optional)"
+                                       data-ng-model="machine.name">
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="domain" class="form__group-label two-col">Domain</label>
+                            <div class="form__group-input three-col">
+                                <select name="domain" id="domain"
+                                    data-ng-model="machine.domain"
+                                    data-ng-options="domain as domain.name for domain in domains">
+                                    <option value="" disabled>Choose a domain</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="architecture" class="form__group-label two-col">Architecture</label>
+                            <div class="form__group-input three-col">
+                                <select name="architecture" id="architecture"
+                                    data-ng-model="machine.architecture"
+                                    data-ng-options="arch for arch in architectures">
+                                    <option value="" disabled>Choose an architecture</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="min_hwe_kernel" class="form__group-label two-col">Minimum Kernel</label>
+                            <div class="form__group-input three-col">
+                                <select name="min_hwe_kernel" id="min_hwe_kernel" placeholder="No minimum kernel"
+                                    data-ng-model="machine.min_hwe_kernel"
+                                    data-ng-options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels">
+                                    <option value="">No minimum kernel</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="zone" class="form__group-label two-col">Zone</label>
+                            <select name="zone" id="zone" class="three-col" placeholder="Choose a zone"
+                                data-ng-model="machine.zone"
+                                data-ng-options="zone as zone.name for zone in zones">
+                            </select>
+                        </div>
+                        <div class="form__group" data-ng-repeat="mac in machine.macs">
+                            <label for="mac-address" class="form__group-label two-col"><span data-ng-hide="mac !== machine.macs[0]">MAC Address</span>&nbsp;</label>
+                            <div class="form__group-input three-col">
+                                <input type="text" id="mac-address" placeholder="00:00:00:00:00:00"
+                                       data-ng-class="{ 'has-error': mac.error }"
+                                       data-ng-model="mac.mac" data-ng-change="validateMac(mac)">
+                                <span class="form__group-remove" title="Delete MAC"
+                                    data-ng-hide="mac === machine.macs[0]" data-ng-click="removeMac(mac)"></span>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <div class="five-col">
+                                <a href="" class="button--secondary button--inline u-float--right" data-ng-click="addMac()">+ Add MAC Address</a>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset six-col last-col"
+                        data-maas-power-parameters="power_types"
+                        data-ng-model="machine.power">
+                    </fieldset>
+                </form>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showChassis()">
+                <h3 class="page-header__dropdown-title">Add chassis</h3>
+                <form action="post" class="form form--stack">
+                    <fieldset class="form__fieldset six-col"
+                        data-maas-power-parameters="chassisPowerTypes"
+                        data-ng-model="chassis.power">
+                    </fieldset>
+                    <fieldset class="form__fieldset six-col last-col">
+                        <div class="form__group">
+                            <label for="domain" class="form__group-label two-col">Domain</label>
+                            <div class="form__group-input three-col">
+                                <select name="domain" id="domain" placeholder="Choose a domain"
+                                    data-ng-model="chassis.domain"
+                                    data-ng-options="domain as domain.name for domain in domains">
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                </form>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-show="showMachine()">
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
+                <div class="page-header__controls">
+                    <a href="" class="button--base button--inline" data-ng-click="cancel()">Cancel</a>
+                    <button class="button--secondary button--inline"
+                        data-ng-class="{ disabled: machineHasError() }"
+                        data-ng-click="saveMachine(true)">Save and add another</button>
+                    <button class="button--primary button--inline"
+                        data-ng-class="{ disabled: machineHasError() }"
+                        data-ng-click="saveMachine(false)">Save machine</button>
+                </div>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showChassis()">
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
+                <div class="page-header__controls">
+                    <a href="" class="button--base button--inline" data-ng-click="cancel()">Cancel</a>
+                    <button class="button--secondary button--inline"
+                        data-ng-class="{ disabled: chassisHasErrors() }"
+                        data-ng-click="saveChassis(true)">Save and add another</button>
+                    <button class="button--primary button--inline"
+                        data-ng-class="{ disabled: chassisHasErrors() }"
+                        data-ng-click="saveChassis(false)">Save chassis</button>
+                </div>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="architectures.length">
+                <p class="page-header__message page-header__message--error">
+                    Cannot add {$ mode $} until boot images have been imported. To fix, visit the <a href="#/images">images page</a>.
+                </p>
+            </section>
+        </div>
+
+        <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.devices.actionOption }">
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError('devices') || hasActionsInProgress('devices')">
+                 <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+                <form class="form form--inline">
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.devices.actionOption.name === 'set-zone'">
+                        <div class="form__group">
+                            <label class="form__group-label" for="zone">Set zone</label>
+                            <select name="zone" id="zone" placeholder="Choose a zone"
+                                data-ng-model="tabs.devices.zoneSelection"
+                                data-ng-options="zone as zone.name for zone in zones">
+                                <option value="" disabled="disabled">Choose a zone</option>
+                            </select>
+                        </div>
+                    </fieldset>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel('devices')">Cancel</a>
+                        <button class="button--primary button--inline" data-ng-click="actionGo('devices')">Go</button>
+                    </div>
+                </form>
+            </div>
+
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError('devices')">
+                <p class="page-header__message page-header__message--error">
+                    {$ tabs.devices.actionErrorCount $}
+                    <span data-ng-pluralize count="tabs.devices.selectedItems.length" when="{'one': 'device', 'other': 'devices'}"></span>
+                    cannot be {$ tabs.devices.actionOption.sentence $}. To proceed, update your selection.
+                </p>
+            </div>
+
+            <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionsInProgress('devices') || hasActionsFailed('devices')">
+                <p class="page-header__message" data-ng-show="hasActionsInProgress('devices')">
+                    <i class="icon icon--loading u-animation--spin"></i>
+                    {$ tabs.devices.actionProgress.completed $} of {$ tabs.devices.actionProgress.total $}
+                    devices have been {$ tabs.devices.actionOption.sentence $}.
+                </p>
+                <p class="page-header__message page-header__message--error"
+                    data-ng-repeat="(error, devices) in tabs.devices.actionProgress.errors">
+                    The {$ tabs.devices.actionOption.title.toLowerCase() $} action for {$ devices.length $}
+                    <span data-ng-pluralize count="devices.length" when="{'one': 'device', 'other': 'devices'}"></span>
+                    failed with error: {$ error $}
+                </p>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': addDeviceScope.viewable }" data-ng-controller="AddDeviceController">
+            <section class="page-header__section twelve-col u-margin--bottom-none">
+                <h3 class="page-header__dropdown-title">Add device</h3>
+                <form action="" class="form form--stack">
+                    <fieldset class="form__fieldset six-col">
+                        <div class="form__group">
+                            <label for="device-name" class="form__group-label two-col">Name</label>
+                            <div class="form__group-input three-col">
+                                <input type="text" id="device-name" placeholder="Name your device"
+                                    data-ng-model="device.name"
+                                    data-ng-class="{ 'has-error': nameHasError() }">
+                            </div>
+
+                        </div>
+                        <div class="form__group">
+                            <label for="domain" class="form__group-label two-col">Domain</label>
+                            <div class="form__group-input three-col">
+                                <select name="domain" id="domain" placeholder="Choose a domain"
+                                    data-ng-model="device.domain"
+                                    data-ng-options="domain as domain.name for domain in domains">
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                </form>
+                <table>
+                    <thead>
+                        <tr>
+                            <th class="table-col--20">MAC address</th>
+                            <th class="table-col--20">IP assignment</th>
+                            <th class="table-col--20">Subnet</th>
+                            <th class="table-col--35">IP address</th>
+                            <th class="table-col--5"></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr data-ng-repeat="interface in device.interfaces">
+                            <td class="table-col--20">
+                                <input type="text" id="mac-address" placeholder="00:00:00:00:00:00"
+                                    data-ng-model="interface.mac"
+                                    data-ng-class="{ 'has-error': macHasError(interface) }">
+                            </td>
+                            <td class="table-col--20">
+                                <select name="ip-assignment" id="ip-assignment"
+                                    placeholder="Select IP assignment" data-ng-model="interface.ipAssignment"
+                                    data-ng-options="assigment.title for assigment in ipAssignments">
+                                    <option value="" disabled selected>Select IP assignment</option>
+                                </select>
+                            </td>
+                            <td class="table-col--20">
+                                <select name="subnet" id="subnet"
+                                    placeholder="Select subnet" data-ng-model="interface.subnetId"
+                                    data-ng-options="subnet.id as subnet.name for subnet in subnets"
+                                    data-ng-show="interface.ipAssignment.name === 'static'">
+                                    <option value="" disabled selected>Select subnet</option>
+                                </select>
+                            </td>
+                            <td class="table-col--35">
+                                <input type="text" id="ip-address" placeholder="000.000.000.000"
+                                    data-ng-model="interface.ipAddress"
+                                    data-ng-class="{ 'has-error': ipHasError(interface) }"
+                                    data-ng-show="interface.ipAssignment.name === 'external'">
+                                <input type="text" id="ip-address"
+                                    data-ng-model="interface.ipAddress"
+                                    data-ng-class="{ 'has-error': ipHasError(interface) }"
+                                    data-ng-show="interface.ipAssignment.name === 'static'">
+                            </td>
+                            <td class="table-col--5 u-u-align---right">
+                                <!-- space needed to set correct height -->
+                                <span data-ng-show="isPrimaryInterface(interface)">&nbsp;</span>
+                                <a title="icon icon--delete" class="icon icon--remove"
+                                    data-ng-click="deleteInterface(interface)"
+                                    data-ng-hide="isPrimaryInterface(interface)">delete</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <button class="button--secondary button--inline" data-ng-click="addInterface()">+ Add another interface</button>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none twelve-col u-margin--bottom-none">
+                <form class="form form--inline">
+                    <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="cancel()">Cancel</a>
+                        <button class="button--secondary button--inline"
+                            data-ng-class="{ disabled: deviceHasError() }"
+                            data-ng-click="save(true)">Save and add another</button>
+                        <button class="button--primary button--inline"
+                            data-ng-class="{ disabled: deviceHasError() }"
+                            data-ng-click="save(false)">Save device</button>
+                    </div>
+                </form>
+            </section>
+        </div>
+
+        <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.controllers.actionOption }">
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError('controllers') || hasActionsInProgress('controllers')">
+                 <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+                <form class="form form--inline">
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.controllers.actionOption.name === 'set-zone'">
+                        <div class="form__group">
+                            <label for="zone" class="form__group-label">Select Zone</label>
+                            <div class="form__group-input">
+                                <select name="zone" id="zone" placeholder="Choose a zone"
+                                    data-ng-model="tabs.controllers.zoneSelection"
+                                    data-ng-options="zone as zone.name for zone in zones">
+                                    <option value="" disabled="disabled">Choose a zone</option>
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <div class="page-header__controls">
+                        <a href="" class="button--base button--inline" data-ng-click="actionCancel('controllers')">Cancel</a>
+                        <button class="button--primary button--inline" data-ng-click="actionGo('controllers')">Go</button>
+                    </div>
+                </form>
+            </div>
+
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError('controllers')">
+                <form class="form form--inline">
+                    <p class="page-header__message page-header__message--error">
+                        {$ tabs.controllers.actionErrorCount $}
+                        <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        cannot be {$ tabs.controllers.actionOption.sentence $}. To proceed, update your selection.
+                    </p>
+                </form>
+            </div>
+
+            <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionsInProgress('controllers') || hasActionsFailed('controllers')">
+                <form class="form form--inline">
+                    <p class="page-header__message" data-ng-show="hasActionsInProgress('controllers')">
+                        <i class="icon icon--loading u-animation--spin u-margin--right-small"></i>
+                        {$ tabs.controllers.actionProgress.completed $} of {$ tabs.controllers.actionProgress.total $}
+                        controllers have been {$ tabs.controllers.actionOption.sentence $}.
+                    </p>
+                    <p class="page-header__message page-header__message--error"
+                        data-ng-repeat="(error, controllers) in tabs.controllers.actionProgress.errors">
+                        The {$ tabs.controllers.actionOption.title.toLowerCase() $} action for {$ controllers.length $}
+                        <span data-ng-pluralize count="controllers.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        failed with error: {$ error $}
+                    </p>
+                </form>
+            </div>
+        </div>
+
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.controllers.addController }">
+
+          <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+          <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="tabs.controllers.addController">
+              <h3 class="page-header__dropdown-title">Add rack controller</h3>
+              <form class="form">
+                  <pre class="u-margin--none">
+<code># To add a new rack controller, SSH into the rack controller.
+# Install the maas-rack-controller package.
+sudo apt install maas-rack-controller
+# Register the rack controller with this MAAS. If the rack controller (and machines)
+# don't have access to the URL, use a different IP address to allow connection.
+sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tabs.controllers.registerSecret $}</code>
+                  </pre>
+              </form>
+          </div>
+          <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="tabs.controllers.addController">
+              <form class="form form--inline">
+                  <div class="page-header__controls">
+                    <button class="button--secondary button--inline"
+                        data-ng-click="tabs.controllers.addController = false">Close</button>
+                  </div>
+              </form>
+          </div>
+      </div>
+    </div>
+</header>
+<div class="row u-padding--top-none">
+    <div class="wrapper--inner">
+    <aside class="three-col">
+        <div class="accordion maas-accordion" data-ng-show="currentpage === 'nodes'"
+            data-ng-class="{ 'is-disabled': tabs.nodes.actionOption }">
+            <h3 class="accordion__title">Filter by</h3>
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.status.length">
+                <h4 class="accordion__tab-title maas-accordion-tab is-active">Status</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                        <li class="accordion__tab-item" data-ng-repeat="status in tabs.nodes.metadata.status | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('status', status.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('status', status.name, 'nodes')">{$ status.name $} ({$ status.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.owner.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Owner</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="owner in tabs.nodes.metadata.owner | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('owner', owner.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'nodes')">{$ owner.name $} ({$ owner.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.release.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">OS/Release</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="release in tabs.nodes.metadata.release | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('release', release.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('release', release.name, 'nodes')">{$ getReleaseTitle(release.name) $} ({$ release.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.tags.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.tags | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('tags', tag.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.storage_tags.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Storage Tags</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.storage_tags | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('storage_tags', tag.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('storage_tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.subnets.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Subnets</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="subnet in tabs.nodes.metadata.subnets | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('subnets', subnet.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('subnets', subnet.name, 'nodes')">{$ subnet.name $} ({$ subnet.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.fabrics.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Fabrics</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="fabric in tabs.nodes.metadata.fabrics | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('fabrics', fabric.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('fabrics', fabric.name, 'nodes')">{$ fabric.name $} ({$ fabric.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.spaces.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Spaces</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="space in tabs.nodes.metadata.spaces | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('spaces', space.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('spaces', space.name, 'nodes')">{$ space.name $} ({$ space.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.zone.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="zone in tabs.nodes.metadata.zone | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('zone', zone.name, 'nodes') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'nodes')">{$ zone.name $} ({$ zone.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="accordion three-col maas-accordion ng-hide" data-ng-show="currentpage === 'devices'"
+            data-ng-class="{ 'is-disabled': tabs.devices.actionOption }">
+            <h3 class="accordion__title">Filter by</h3>
+            <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.devices.metadata.owner.length">
+                <h4 class="accordion__tab-title maas-accordion-tab active">Owner</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="owner in tabs.devices.metadata.owner | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('owner', owner.name, 'devices') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'devices')">{$ owner.name $} ({$ owner.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.devices.metadata.tags.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="tag in tabs.devices.metadata.tags | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('tags', tag.name, 'devices') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'devices')">{$ tag.name $} ({$ tag.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ng-hide accordion__tab" data-ng-show="tabs.devices.metadata.zone.length">
+                <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>
+                <div class="accordion__tab-content">
+                    <ul class="accordion__tab-list">
+                        <li class="accordion__tab-item" data-ng-repeat="zone in tabs.devices.metadata.zone | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('zone', zone.name, 'devices') }">
+                            <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'devices')">{$ zone.name $} ({$ zone.count $})</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </aside>
+    <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+    <div class="nine-col last-col" data-ng-show="currentpage === 'nodes'">
+        <form>
+            <div id="search-bar" class="search nine-col">
+                <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                <input
+                    type="search" placeholder="Search nodes" class="search__input"
+                    data-ng-model="tabs.nodes.search" data-ng-change="updateFilters('nodes')"
+                    data-ng-class="{ error: !tabs.nodes.searchValid }"
+                    data-ng-disabled="tabs.nodes.actionOption" />
+                <input type="submit" class="search__submit"
+                    data-ng-class="{ 'search__submit--close': tabs.nodes.search.length > 0 }"
+                    data-ng-click="clearSearch('nodes')" />
+            </div>
+            <table id="nodes-listing">
+                <thead>
+                    <tr>
+                        <th class="table-col--3">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <input class="checkbox" type="checkbox" data-ng-click="toggleCheckAll('nodes')" data-ng-checked="tabs.nodes.allViewableChecked" id="check-all" data-ng-disabled="hasActionsInProgress('nodes')" />
+                            <label class="checkbox-label" for="check-all"></label>
+                        </th>
+                        <th colspan="2" class="u-align--left">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href=""
+                                data-ng-click="selectColumnOrSort('fqdn', 'nodes')"
+                                data-ng-class="{'is-active': tabs.nodes.column === 'fqdn', 'is-sorted': tabs.nodes.predicate === 'fqdn', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}"><span title="Fully Qualified Domain Name">FQDN</span></a>
+                            <span class="divide"></span>
+                            <a href=""
+                                data-ng-click="selectColumnOrSort('pxe_mac', 'nodes')"
+                                data-ng-class="{'is-active': tabs.nodes.column === 'pxe_mac', 'is-sorted': tabs.nodes.predicate === 'pxe_mac', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}"><span title="Media Access Control addresses">MAC</span></a>
+                        </th>
+                        <th class="u-align--center">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" class="u-align--center" data-ng-click="sortTable('power_state', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate === 'power_state', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">Power</a>
+                        </th>
+                        <th class="table-col--3"></th>
+                        <th>
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" data-ng-click="sortTable('status', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate === 'status', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">Status</a>
+                        </th>
+                        <th class="table-col--10">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" data-ng-click="sortTable('owner', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate === 'owner', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">Owner</a>
+                        </th>
+                        <th class="u-align--right">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" data-ng-click="sortTable('cpu_count', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate=== 'cpu_count', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">Cores</a>
+                        </th>
+                        <th class="u-align--right">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" data-ng-click="sortTable('memory', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate === 'memory', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">RAM (GiB)</a>
+                        </th>
+                        <th class="u-align--right">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" data-ng-click="sortTable('disks', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate === 'disks', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">Disks</a>
+                        </th>
+                        <th class="u-align--right">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <a href="" data-ng-click="sortTable('storage', 'nodes')" data-ng-class="{'is-sorted': tabs.nodes.predicate === 'storage', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">Storage (GB)</a>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- XXX blake_r 2015-02-18 - Need to add e2e test. This really needs lots of tests. -->
+                    <tr
+                        data-ng-repeat="node in tabs.nodes.filtered_items = (nodes | nodesFilter:tabs.nodes.search | orderBy:tabs.nodes.predicate:tabs.nodes.reverse) track by node.system_id"
+                        data-ng-class="{ 'table--error': !supportsAction(node, 'nodes'), selected: node.$selected }">
+                        <td class="table-col--3">
+                            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                            <input class="checkbox" type="checkbox" data-ng-click="toggleChecked(node, 'nodes')" data-ng-checked="node.$selected" id="{$ node.fqdn $}" data-ng-disabled="hasActionsInProgress('nodes')" />
+                            <label class="checkbox-label" for="{$ node.fqdn $}"></label>
+                        </td>
+                        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                        <td class="u-align--left" data-ng-show="tabs.nodes.column === 'fqdn'" colspan="2">
+                            <a href="#/node/{$ node.system_id $}">{$ node.fqdn $}</a>
+                        </td>
+                        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                        <td class="ng-hide u-align--left" data-ng-show="tabs.nodes.column === 'pxe_mac'" colspan="2">
+                            <a href="#/node/{$ node.system_id $}" title="{$ node.pxe_mac_vendor $}">{$ node.pxe_mac $}</a>
+                            <a href="#/node/{$ node.system_id $}" class="extra-macs" data-ng-show="node.extra_macs.length">(+{$ node.extra_macs.length $})</a>
+                        </td>
+                        <td class="powerstate u-align--center">
+                            <span title="{$ node.power_state $}" class="icon icon--power-{$ node.power_state $}"></span>
+                        </td>
+                        <td class="table-col--3"><i data-ng-if="showSpinner(node)" class="icon icon--loading u-animation--spin"></i></td>
+                        <td class="status u-text--truncate">{$ getStatusText(node) $}</td>
+                        <td class="table-col--10">{$ node.owner $}</td>
+                        <td class="u-align--right">{$ node.cpu_count $}</td>
+                        <td class="u-align--right">{$ node.memory $}</td>
+                        <td class="u-align--right">{$ node.physical_disk_count $}</td>
+                        <td class="u-align--right">{$ node.storage $}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </form>
+    </div>
+    <div class="nine-col last-col" class="ng-hide" data-ng-show="currentpage === 'devices'">
+        <div class="search nine-col">
+            <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+            <input
+                type="search" placeholder="Search devices" class="search__input"
+                data-ng-model="tabs.devices.search" data-ng-change="updateFilters('devices')"
+                data-ng-class="{ error: !tabs.devices.searchValid }"
+                data-ng-disabled="tabs.devices.actionOption" />
+            <input type="submit" class="search__submit"
+                data-ng-class="{ 'search__submit--close': tabs.devices.search.length > 0 }"
+                data-ng-click="clearSearch('devices')" />
+        </div>
+        <table>
+            <thead>
+                <tr>
+                    <th class="table-col--3">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleCheckAll('devices')" data-ng-checked="tabs.devices.allViewableChecked" id="check-all-devices" data-ng-disabled="hasActionsInProgress('devices')" />
+                        <label for="check-all-devices" class="checkbox-label"></label>
+                    </th>
+                    <th class="table-col--24">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <a href="" data-ng-click="sortTable('fqdn', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'fqdn', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">
+                            <span title="Fully Qualified Domain Name">FQDN</span>
+                        </a>
+                    </th>
+                    <th class="table-col--25">
+                        <a href="" data-ng-click="sortTable('primary_mac', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'primary_mac', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">
+                            <span title="Media Access Control addresses">MAC</span>
+                        </a>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('ip_assignment', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'ip_assignment', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">IP Assignment</a>
+                    </th>
+                    <th class="table-col--20">
+                        <a href="" data-ng-click="sortTable('ip_address', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'ip_address', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">IP Address</a>
+                    </th>
+                    <th class="table-col--12">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <a href="" data-ng-click="sortTable('owner', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'owner', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">Owner</a>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. This really needs lots of tests. -->
+                <tr
+                    data-ng-repeat="device in tabs.devices.filtered_items = (devices | nodesFilter:tabs.devices.search | orderBy:tabs.devices.predicate:tabs.devices.reverse) track by device.system_id"
+                    data-ng-class="{ 'table--error': !supportsAction(device, 'devices'), selected: device.$selected }">
+                    <td class="table-col--3">
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleChecked(device, 'devices')" data-ng-checked="device.$selected" id="{$ device.fqdn $}" data-ng-disabled="hasActionsInProgress('devices')"/>
+                        <label for="{$ device.fqdn $}" class="checkbox-label"></label>
+                    </td>
+                    <td class="table-col--24">{$ device.fqdn $}</td>
+                    <td class="table-col--25">
+                        {$ device.primary_mac $}
+                        <span class="extra-macs" data-ng-show="device.extra_macs.length">(+{$ device.extra_macs.length $})</span>
+                    </td>
+                    <td class="table-col--15">{$ getDeviceIPAssignment(device.ip_assignment) $}</td>
+                    <td class="table-col--20">{$ device.ip_address $}</td>
+                    <td class="table-col--12">{$ device.owner $}</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="twelve-col last-col" class="ng-hide" data-ng-show="currentpage === 'controllers'">
+        <div class="search twelve-col">
+            <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+            <input
+                type="search" placeholder="Search controllers" class="search__input"
+                data-ng-model="tabs.controllers.search" data-ng-change="updateFilters('controllers')"
+                data-ng-class="{ error: !tabs.controllers.searchValid }"
+                data-ng-disabled="tabs.controllers.actionOption" />
+            <input type="submit" class="search__submit"
+                data-ng-class="{ 'search__submit--close': tabs.controllers.search.length > 0 }"
+                data-ng-click="clearSearch('controllers')" />
+        </div>
+        <table>
+            <thead>
+                <tr>
+                    <th class="table-col--2">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleCheckAll('controllers')" data-ng-checked="tabs.controllers.allViewableChecked" id="check-all-controllers" data-ng-disabled="hasActionsInProgress('controllers')" />
+                        <label for="check-all-controllers" class="checkbox-label"></label>
+                    </th>
+                    <th class="table-col--19">
+                        <a href="" data-ng-click="sortTable('fqdn', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'fqdn', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">
+                            <span title="Fully Qualified Domain Name">Name</span>
+                        </a>
+                    </th>
+                    <th class="table-col--4 u-align--center">
+                        <span title="Status">Status</span>
+                    </th>
+                    <th class="table-col--25">
+                        <a href="" data-ng-click="sortTable('node_type_display', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'node_type_display', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">
+                            <span title="Controller Type">Type</span>
+                        </a>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('updated', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'updated', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">Last Image Sync</a>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('updated', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'updated', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">Images Status</a>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. This really needs lots of tests. -->
+                <tr
+                    data-ng-repeat="controller in tabs.controllers.filtered_items = (controllers | nodesFilter:tabs.controllers.search | orderBy:tabs.controllers.predicate:tabs.controllers.reverse) track by controller.system_id"
+                    data-ng-class="{ 'table--error': !supportsAction(controller, 'controllers'), selected: controller.$selected }">
+                    <td class="table-col--2">
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleChecked(controller, 'controllers')" data-ng-checked="controller.$selected" id="{$ controller.fqdn $}" data-ng-disabled="hasActionsInProgress('controllers')"/>
+                        <label for="{$ controller.fqdn $}" class="checkbox-label"></label>
+                    </td>
+                    <td class="table-col--19">
+                        <a href="#/node/controller/{$ controller.system_id $}">{$ controller.fqdn $}</a>
+                    </td>
+                    <td class="table-col--4 u-align--center" data-maas-controller-status="controller" data-maas-services="services"></td>
+                    <td class="table-col--25">{$ controller.node_type_display $}</td>
+                    <td class="table-col--15">{$ controller.last_image_sync || 'Never' $}</td>
+                    <td class="table-col--15">
+                        <maas-controller-image-status system-id="controller.system_id"></maas-controller-image-status>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+</div>
+>>>>>>> MERGE-SOURCE

=== modified file 'src/maasserver/static/partials/settings.html'
--- src/maasserver/static/partials/settings.html	2017-04-18 14:59:13 +0000
+++ src/maasserver/static/partials/settings.html	2017-04-25 09:34:40 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <div class="wrapper--sticky" sticky media-query="min-width: 769px">
     <header class="page-header u-margin--bottom-none">
         <div class="wrapper--inner">
@@ -8,6 +9,9 @@
         </div>
     </header>
     <div class="page-navigation">
+=======
+<header class="page-header u-margin--bottom" sticky>
+>>>>>>> MERGE-SOURCE
     <div class="wrapper--inner">
         <nav class="page-navigation__links">
             <a role="tab" class="page-navigation__link" href="settings/">General</a>

=== modified file 'src/maasserver/static/partials/space-details.html'
--- src/maasserver/static/partials/space-details.html	2017-03-27 13:09:56 +0000
+++ src/maasserver/static/partials/space-details.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,20 @@
 <div data-ng-hide="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
 <div class="ng-hide" data-ng-show="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">{$ space.name $}</h1>
             <div class="page-header__controls ng-hide" data-ng-show="isSuperUser() && !isDefaultSpace() && !loading">

=== modified file 'src/maasserver/static/partials/ssh-keys.html'
--- src/maasserver/static/partials/ssh-keys.html	2017-03-28 14:56:11 +0000
+++ src/maasserver/static/partials/ssh-keys.html	2017-04-25 09:34:40 +0000
@@ -12,6 +12,7 @@
             data-ng-class="{ 'is-active': group.id === openRow }">
             <div class="table__data table-col--25" aria-label="Source">{$ sourceTitles[group.source] $}</div>
             <div data-ng-if="group.source !== 'upload'">
+<<<<<<< TREE
                 <div class="table__data table-col--35" aria-label="ID">{$ group.authId $}</div>
                 <div class="table__data table-col--30" aria-label="Number of keys">{$ group.keys.length $}
                     <button class="icon icon--open tooltip u-margin--top-tiny u-padding--left-large" aria-label="Open"
@@ -21,13 +22,29 @@
                         data-ng-click="close()"
                         data-ng-if="group.source !== 'upload' && openRow === group.id">Close</button>
                 </div>
+=======
+                <div class="table__data table-col--35">{$ group.authId $}</div>
+                <div class="table__data table-col--30">{$ group.keys.length $}
+                  <a class="icon icon--open tooltip u-margin--top-tiny u-padding--left-large" aria-label="Open"
+                    data-ng-click="open(group, 'view')"
+                    data-ng-if="group.source !== 'upload' && openRow !== group.id">Open</a>
+                  <a class="icon icon--close tooltip u-margin--top-tiny u-padding--left-large" aria-label="Close"
+                      data-ng-click="close()"
+                      data-ng-if="group.source !== 'upload' && openRow === group.id">Close</a></div>
+>>>>>>> MERGE-SOURCE
             </div>
             <div data-ng-if="group.source === 'upload'">
                 <div class="table__data table-col--65" data-ng-bind-html="trustAsHtml(group.keys[0].display)"></div>
             </div>
+<<<<<<< TREE
             <div class="table__data table-col--10 u-align--right">
                 <button class="icon icon--delete tooltip" aria-label="Delete"
                     data-ng-click="open(group, 'delete')">Delete</button>
+=======
+            <div class="table__data table-col--10 u-align--right">
+                <a class="icon icon--delete tooltip" aria-label="Delete"
+                    data-ng-click="open(group, 'delete')">Delete</a>
+>>>>>>> MERGE-SOURCE
             </div>
             <div class="table__dropdown">
                 <div class="table__row u-border--none"

=== modified file 'src/maasserver/static/partials/subnet-details.html'
--- src/maasserver/static/partials/subnet-details.html	2017-04-18 14:59:13 +0000
+++ src/maasserver/static/partials/subnet-details.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,21 @@
 <div data-ng-hide="loaded">
+<<<<<<< TREE
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
+<<<<<<< TREE
 <div class="ng-hide" data-ng-show="loaded" window-width>
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<div class="ng-hide" data-ng-show="loaded">
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
           <h1 class="page-header__title">{$ subnet.cidr $}</h1>
             <!-- "Take action" dropdown -->
@@ -39,8 +48,13 @@
                 <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="actionError">
                     <p class="page-header__message page-header__message--error">{$ actionError $}</p>
                     <div class="page-header__controls">
+<<<<<<< TREE
                         <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
                         <button class="button--secondary button--inline" data-ng-click="actionRetry()">Retry</button>
+=======
+                        <a href="" class="button--base button--inline" data-ng-click="cancelAction()">Cancel</a>
+                        <button class="button--primary button--inline" data-ng-click="actionRetry()">Retry</button>
+>>>>>>> MERGE-SOURCE
                     </div>
                 </section>
   	    </div>

=== modified file 'src/maasserver/static/partials/vlan-details.html'
--- src/maasserver/static/partials/vlan-details.html	2017-03-27 13:09:56 +0000
+++ src/maasserver/static/partials/vlan-details.html	2017-04-25 09:34:40 +0000
@@ -1,12 +1,22 @@
+<<<<<<< TREE
 <div data-ng-if="!vlanDetails.loaded">
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<div data-ng-hide="vlanDetails.loaded">
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">Loading...</h1>
         </div>
     </header>
 </div>
+<<<<<<< TREE
 <div data-ng-if="vlanDetails.loaded">
     <header class="page-header" sticky media-query="min-width: 769px">
+=======
+<div class="ng-hide" data-ng-show="vlanDetails.loaded">
+    <header class="page-header" sticky>
+>>>>>>> MERGE-SOURCE
         <div class="wrapper--inner">
             <h1 class="page-header__title">{$ vlanDetails.title $}</h1>
             <!-- "Take action" dropdown -->

=== added file 'src/maasserver/static/scss/_base.forms.scss.OTHER'
--- src/maasserver/static/scss/_base.forms.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/_base.forms.scss.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,377 @@
+////
+/// @author       Web Team at Canonical Ltd
+/// @link         http://ubuntudesign.github.io/vanilla-framework/docs/#mixin-maas-forms
+/// @since        0.0.3
+////
+
+/// Form element styles
+/// @group Forms
+@mixin maas-forms {
+
+  // All input elements
+  input {
+
+    &[type='text'],
+    &[type='number'],
+    &[type='search'],
+    &[type='password'],
+    &[type='email'],
+    &[type='url'],
+    &[type='tel'] {
+      @extend %input-elements;
+      padding: 7px 10px;
+      box-shadow: none;
+      width: 100%;
+
+      &::placeholder {
+        color: $warm-grey;
+      }
+
+      &[disabled] {
+        color: $warm-grey;
+        background-color: $transparent;
+      }
+    }
+
+    &[type='number'] {
+      padding-right: 15px;
+    }
+
+    &[type='search'] {
+      appearance: textfield;
+    }
+
+    &[type='search']::-webkit-search-decoration,
+    &[type='search']::-webkit-search-cancel-button {
+      appearance: none;
+    }
+
+    &[type='checkbox'] {
+      margin: 4px 0 0;
+      margin-top: 1px	9;
+      line-height: normal;
+    }
+
+    &[type='radio'],
+    &[type='image'] {
+      display: inline-block;
+      margin-right: 10px;
+    }
+  }
+
+  // Text area styles
+  textarea {
+    height: auto;
+    min-height: 175px;
+    padding: 7px 10px !important;
+    box-shadow: none;
+    width: 100%;
+    line-height: 20px;
+
+    &::placeholder {
+      color: $warm-grey;
+    }
+
+    &[disabled] {
+      color: $warm-grey;
+      background-color: $transparent;
+    }
+  }
+
+  // Select dropdown styles
+  select {
+    @extend %input-elements;
+    display: block;
+    clear: both;
+    cursor: pointer;
+    margin: 0;
+    background-image: url('#{$asset-path}images/forms/chevron-down.svg');
+    background-repeat: no-repeat;
+    background-position: top 14px right 10px;
+    background-color: $white;
+    padding: 7px 30px 7px 10px !important;
+    box-shadow: none;
+    width: 100%;
+
+    // Removes firefox select styles & arrow
+    -moz-appearance: none;
+    appearance: none;
+    text-indent: .01px;
+    text-overflow: '';
+
+    &[multiple],
+    &[size] {
+      height: auto;
+      background-image: none;
+      padding-top: 10px;
+    }
+
+    &[disabled] {
+      color: $warm-grey;
+      background-image: none;
+      background-color: $transparent;
+    }
+
+    // Removes firefox dotted outline focusing
+    &:-moz-focusring {
+      color: transparent;
+      text-shadow: 0 0 0 $black;
+    }
+
+    &::-ms-expand {
+      display: none;
+    }
+  }
+
+  fieldset {
+    background: none;
+    margin-left: 0;
+    padding: 0;
+  }
+
+  label {
+    display: inline-block;
+    max-width: 100%;
+    margin-bottom: 5px;
+  }
+
+  /// Base for label styling
+  [type="checkbox"] {
+
+    &:not(:checked),
+    &:checked {
+      position: absolute;
+      left: -9999px;
+    }
+
+    + label {
+      height: 16px;
+      position: relative;
+      padding-left: 25px;
+      cursor: pointer;
+
+      &:before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 3px;
+        width: 11px;
+        height: 11px;
+        border: 1px solid $mid-grey;
+        background: $white;
+        border-radius: 2px;
+      }
+    }
+
+    &:checked {
+
+      + label:before {
+        background-color: $input-checked;
+        border-color: $input-checked;
+      }
+
+      + label:after {
+        content: '✔';
+        position: absolute;
+        line-height: 13px;
+        top: 3px;
+        left: 3px;
+        font-size: 10px;
+        color: $white;
+        transition: all .2s;
+
+        @-moz-document url-prefix() {
+          font-size: 13px;
+          left: 1px;
+        }
+      }
+    }
+
+    &[disabled] {
+      cursor: not-allowed;
+
+      + label {
+        cursor: not-allowed;
+
+        &:before {
+          opacity: .5;
+        }
+      }
+    }
+  }
+
+  [type="radio"] {
+
+    &:not(:checked),
+    &:checked {
+      position: absolute;
+      left: -9999px;
+    }
+
+    + label {
+      position: relative;
+      padding-left: 25px;
+      cursor: pointer;
+
+      &:before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 1px;
+        width: 13px;
+        height: 13px;
+        border: 1px solid $mid-grey;
+        background: $white;
+        border-radius: 50%;
+      }
+    }
+
+    &:checked {
+
+      + label:after {
+        content: '';
+        position: absolute;
+        left: 3px;
+        top: 4px;
+        width: 9px;
+        height: 9px;
+        background: $input-checked;
+        border-radius: 50%;
+      }
+    }
+  }
+
+  .tags {
+    width: 100%;
+
+    .tag-list {
+      width: 100%;
+      margin: 0;
+
+      .tag-item {
+        display: inline-block;
+        float: left;
+        line-height: 36px;
+        margin-bottom: 0;
+        margin-right: 10px;
+        word-wrap: break-word;
+
+        .remove-button {
+          border-bottom: 0;
+        }
+      }
+    }
+
+    .input {
+      width: 100% !important;
+    }
+  }
+
+  .onoffswitch {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    width: 38px;
+    margin: 0 0 4px;
+    //scss-lint:disable VendorPrefixes
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    //scss-lint:enable VendorPrefixes
+
+    &[disabled] {
+
+      .onoffswitch-checkbox,
+      .onoffswitch-label {
+        opacity: .5;
+        pointer-events: none;
+      }
+    }
+  }
+
+  .onoffswitch-external-label {
+    display: inline-block;
+    margin-left: 5px;
+  }
+
+  .onoffswitch-checkbox {
+    display: none !important;
+  }
+
+  .onoffswitch-label {
+    display: block !important;
+    overflow: hidden;
+    cursor: pointer;
+    border-radius: 2px;
+    padding-left: 0 !important;
+    margin: 0 !important;
+
+    &:before,
+    &:after {
+      display: none;
+    }
+  }
+
+  .onoffswitch-inner {
+    display: block;
+    width: 200%;
+    margin-left: -100%;
+    transition: margin .3s ease-in 0s;
+
+    &:before,
+    &:after {
+      display: block;
+      float: left;
+      width: 50%;
+      height: 18px;
+      padding: 0;
+      line-height: 18px;
+      font-size: 14px;
+      color: $white;
+      font-family: Trebuchet, Arial, sans-serif;
+      font-weight: bold;
+      box-sizing: border-box;
+    }
+
+    &:before {
+      content: '';
+      padding-left: 10px;
+      background-color: $success;
+      color: $white;
+    }
+
+    &:after {
+      content: '';
+      padding-right: 10px;
+      background-color: $gallery-grey;
+      color: $warm-grey;
+      text-align: right;
+    }
+  }
+
+  .onoffswitch-switch {
+    display: block;
+    width: 19px;
+    height: 16px;
+    margin: 0;
+    background: $white;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 19px;
+    border: 1px solid $outline;
+    border-radius: 2px;
+    transition: all .3s ease-in 0s;
+    box-sizing: border-box;
+  }
+
+  .onoffswitch-checkbox:checked + .onoffswitch-label {
+    .onoffswitch-inner {
+      margin-left: 0;
+    }
+
+    .onoffswitch-switch {
+      right: 0;
+    }
+  }
+}

=== added file 'src/maasserver/static/scss/_components.buttons.scss.OTHER'
--- src/maasserver/static/scss/_components.buttons.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/_components.buttons.scss.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,149 @@
+////
+/// @author       Web Team at Canonical Ltd
+/// @link         http://ubuntudesign.github.io/maas-gui-vanilla-theme/docs/#mixin-maas-buttons
+/// @since        0.0.1
+////
+
+/// Buttons element styles
+/// @group Forms
+@mixin maas-buttons {
+  // .button--primary {
+  //   line-height: 20px;
+  // }
+
+  .button--primary,
+  .button--secondary {
+    @extend %button-pattern;
+  }
+
+  .button--secondary {
+    line-height: 18px;
+  }
+
+  .button--primary,
+  .button--destructive,
+  .button--positive {
+
+    &:hover {
+      color: $white;
+    }
+  }
+
+  .button--base,
+  .button--neutral {
+
+    &:hover {
+      color: $cool-grey;
+    }
+  }
+
+  .button--large {
+    height: auto;
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+}
+
+@mixin maas-button-group {
+  .button-group {
+    position: relative;
+    width: 100%;
+    vertical-align: middle;
+    clear: both;
+    min-width: 160px;
+
+    &.button-group--inline {
+      display: inline-block;
+      width: auto;
+    }
+
+    .button-group__link {
+      display: inline-block;
+      float: left;
+      text-align: left;
+      padding-right: 35px;
+
+      &::after {
+        content: '';
+        display: inline-block;
+        position: absolute;
+        top: 15px;
+        right: 15px;
+        width: 4px;
+        height: 4px;
+        vertical-align: middle;
+        border-right: 1px solid;
+        border-bottom: 1px solid;
+        transform: rotate(45deg);
+      }
+    }
+
+    .button-group__dropdown {
+      border-radius: 3px;
+      left: 0;
+      margin: 0;
+      list-style: none;
+      background: $white;
+      box-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+      z-index: 20;
+      max-height: 1000px;
+      transition: max-height .3s ease-in;
+      position: absolute;
+      top: 36px;
+      clear: both;
+      min-width: 160px;
+    }
+
+    .button-group__item {
+      float: left;
+      clear: both;
+      padding: 5px 10px;
+      margin: 0;
+      width: 100%;
+
+      .button-group__item-link {
+        color: $cool-grey;
+        cursor: pointer;
+        width: 100%;
+        float: left;
+        margin: 0;
+        border: 0;
+        text-transform: lowercase;
+        white-space: nowrap;
+
+        &:first-letter {
+          text-transform: uppercase;
+        }
+
+        &:hover {
+          color: $link-hover;
+          text-decoration: none;
+        }
+      }
+    }
+  }
+  // scss-lint:enable SelectorFormat
+}
+
+%button-pattern {
+  line-height: 20px;
+  white-space: nowrap;
+  vertical-align: middle;
+  touch-action: manipulation;
+  cursor: pointer;
+  user-select: none;
+  padding: 8px 14px;
+  height: 36px;
+  box-sizing: border-box;
+
+  &[disabled],
+  &.button--disabled {
+    pointer-events: none;
+    opacity: .5;
+  }
+
+  &.button--inline {
+    display: inline-block;
+    width: auto;
+  }
+}

=== added file 'src/maasserver/static/scss/_components.flashmessages.scss.OTHER'
--- src/maasserver/static/scss/_components.flashmessages.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/_components.flashmessages.scss.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,59 @@
+////
+/// @author       Web Team at Canonical Ltd
+/// @link         http://ubuntudesign.github.io/maas-gui-vanilla-theme/docs/#mixin-tool-tips
+/// @since        0.0.1
+////
+
+/// Flash message styles
+/// @group maas flash messages
+@mixin maas-flash-messages {
+  .flash-messages {
+    width: 100%;
+    float: left;
+    margin: 0;
+
+    .flash-messages__item {
+      box-sizing: border-box;
+      border-radius: 2px;
+      list-style: none;
+      padding: 15px 20px;
+      margin: 0 0 20px;
+      background: $white;
+      background-position: top 50% left 15px;
+      background-repeat: no-repeat;
+      box-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+
+      &.flash-messages__item--error {
+        background: $white url('#{$asset-path}images/icons/error.svg') no-repeat;
+        background-size: 16px 16px;
+        background-position: 15px center;
+        padding-left: 45px;
+      }
+
+      &.flash-messages__item--info {
+        background: $white url('#{$asset-path}images/icons/info.svg') no-repeat;
+        background-size: 16px 16px;
+        background-position: 15px center;
+        padding-left: 45px;
+      }
+
+      &.flash-messages__item--warning {
+        background: $white url('#{$asset-path}images/icons/warning.svg') no-repeat;
+        background-size: 16px 16px;
+        background-position: 15px center;
+        padding-left: 45px;
+      }
+
+      &.flash-messages__item--success {
+        background: $white url('#{$asset-path}images/icons/success.svg') no-repeat;
+        background-size: 16px 16px;
+        background-position: 15px center;
+        padding-left: 45px;
+      }
+    }
+  }
+}

=== added file 'src/maasserver/static/scss/_components.forms.scss.OTHER'
--- src/maasserver/static/scss/_components.forms.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/_components.forms.scss.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,201 @@
+////
+/// @author       Web Team at Canonical Ltd
+/// @link         http://ubuntudesign.github.io/vanilla-framework/docs/#mixin-vf-forms
+/// @since        0.0.3
+////
+
+/// Form layout element styles
+/// @group Forms
+@mixin maas-form-layouts {
+  .form {
+
+    .form__group {
+      margin-bottom: 10px;
+
+      .form__group-input {
+        position: relative;
+
+        .form__group-remove {
+          position: absolute;
+          top: 10px;
+          right: 10px;
+          cursor: pointer;
+          height: 16px;
+          width: 16px;
+          background: url('#{$asset-path}images/icons/remove.svg') no-repeat;
+          background-size: 75% 75%;
+          background-position: center;
+          display: inline-block;
+        }
+
+        .icon {
+          position: absolute;
+          top: 10px;
+          right: 10px;
+          display: inline-block;
+        }
+      }
+
+      &.form__group--subtle {
+
+        .form__group-label {
+          color: $warm-grey;
+        }
+
+        input,
+        select,
+        textarea {
+          border-color: $mercury-grey;
+          background-color: transparent;
+
+          &:hover {
+            border-color: $mid-grey;
+            background-color: $white;
+            outline: none;
+          }
+
+          &:active,
+          &:focus {
+            border-color: $warm-grey;
+            background-color: $white;
+            outline: none;
+          }
+        }
+      }
+    }
+
+    .form__fieldset {
+
+      .form__group:last-of-type {
+        margin-bottom: 0;
+      }
+    }
+
+    .form__siblings {
+      float: left;
+      width: 100%;
+      margin-bottom: 10px;
+
+      &:hover {
+
+        .form__group--subtle {
+
+          input,
+          select,
+          textarea {
+            border-color: $mid-grey;
+            background-color: $white;
+            outline: none;
+          }
+        }
+      }
+
+      &.is-active {
+
+        .form__group--subtle {
+
+          input,
+          select,
+          textarea {
+            border-color: $mid-grey;
+            background-color: $white;
+            outline: none;
+          }
+        }
+      }
+    }
+
+    &.form--stack {
+
+      .form__group {
+        width: 100%;
+        float: left;
+
+        [class*='-col'] {
+          margin-bottom: 0;
+        }
+
+        .form__group-label {
+          margin-top: 0;
+          margin-bottom: 0;
+          line-height: 34px;
+          vertical-align: top;
+        }
+
+        .form__group-input {
+          min-height: 34px;
+
+          .onoffswitch {
+            margin-top: 9px;
+          }
+        }
+      }
+    }
+
+    &.form--inline {
+
+      .form__fieldset {
+        display: inline-block;
+        width: auto;
+        margin: 0;
+        vertical-align: middle;
+      }
+
+      .form__group {
+        display: inline-block;
+        margin: 0 20px 0 0;
+        vertical-align: top;
+
+        .form__group-label {
+          margin-bottom: 0;
+          margin-right: 10px;
+          vertical-align: top;
+          line-height: 34px;
+
+          .icon--left {
+            position: absolute;
+            left: 0;
+            top: 12px;
+          }
+        }
+
+        input,
+        select,
+        .form__group-input {
+          display: inline-block;
+          width: auto;
+          min-height: 34px;
+        }
+
+        [type='checkbox'] + label,
+        [type='radio'] + label {
+          line-height: 34px;
+        }
+
+        .onoffswitch {
+          margin: 9px 0 0;
+        }
+
+        .onoffswitch-external-label {
+          margin: 0;
+          vertical-align: middle;
+          line-height: 34px;
+        }
+      }
+    }
+
+    .form__help-text {
+      @include font-size(14px);
+      color: $warm-grey;
+    }
+  }
+
+  .form__error {
+    margin: 0;
+    color: $error;
+
+    .form__error-item {
+      margin: 6px 0;
+    }
+  }
+}

=== added file 'src/maasserver/static/scss/_components.icons.scss.OTHER'
--- src/maasserver/static/scss/_components.icons.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/_components.icons.scss.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,274 @@
+////
+/// @author       Web Team at Canonical Ltd
+/// @link         http://ubuntudesign.github.io/maas-gui-vanilla-theme/docs/#mixin-maas-icons
+/// @since        0.0.1
+////
+
+/// Icons
+/// @group Icons
+@mixin maas-icons {
+
+  .icon {
+    @include icon-size(16px);
+    padding: 0;
+    border-bottom: 0 !important;
+    display: inline-block;
+    vertical-align: middle;
+    text-indent: 999em;
+
+    &.icon--add {
+        background: url('#{$asset-path}images/icons/add.svg') no-repeat;
+        background-size: 100% 100%;
+    }
+
+    &.icon--account {
+      background: url('#{$asset-path}images/icons/account.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--cross {
+      background: url('#{$asset-path}images/icons/cross.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--cross-orange {
+      background: url('#{$asset-path}images/icons/cross-orange.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--debug {
+      background: url('#{$asset-path}images/icons/debug.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--delete {
+      background: url('#{$asset-path}images/icons/delete.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--edit {
+      background: url('#{$asset-path}images/icons/edit.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--error {
+      background: url('#{$asset-path}images/icons/error.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--help {
+      background: url('#{$asset-path}images/icons/help.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--info {
+      background: url('#{$asset-path}images/icons/info.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--loading {
+      background: url('#{$asset-path}images/icons/loading.png') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--mount {
+      background: url('#{$asset-path}images/icons/mount.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--unmount {
+      background: url('#{$asset-path}images/icons/unmount.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--partition {
+      background: url('#{$asset-path}images/icons/partition.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--power-error {
+      background: url('#{$asset-path}images/icons/power-error.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--power-off {
+      background: url('#{$asset-path}images/icons/power-off.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--power-on {
+      background: url('#{$asset-path}images/icons/power-on.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--remove {
+      background: url('#{$asset-path}images/icons/remove.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--success {
+      background: url('#{$asset-path}images/icons/success.svg') no-repeat;
+      background-size: 100% 100%;
+
+      &-mono {
+        background: url('#{$asset-path}images/icons/success-mono.svg') no-repeat;
+        background-size: 100% 100%;
+      }
+
+      &-grey {
+        background: url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="success"><rect id="rect6708" x="0" y="9.99999989e-06" width="16" height="16"></rect><circle id="circle6710" stroke="#{$warm-grey}" stroke-width="1.5" fill="#{$warm-grey}" cx="8" cy="8.00001" r="7.2500086"></circle><polygon id="path6712" fill="#{$white}" points="11.80029 4.92345 11.73439 4.98115 6.99964 9.12837 4.22407 6.74743 3.38501 7.69631 7.00033 11.50002 12.5 5.71278 11.80029 4.92349"></polygon></g></g></svg>');
+        background-size: 100% 100%;
+      }
+    }
+
+    &.icon--settings {
+      background: url('#{$asset-path}images/icons/settings.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--sync {
+      background: url('#{$asset-path}images/icons/sync.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--search {
+      background: url('#{$asset-path}images/icons/magnifying_glass.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--system-shutdown {
+      background: url('#{$asset-path}images/icons/system-shutdown.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--tooltip {
+      background: url('#{$asset-path}images/icons/tooltip.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--tags {
+      background: url('#{$asset-path}images/icons/tags.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--tick {
+      background: url('#{$asset-path}images/icons/tick.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--logical-volume {
+      background: url('#{$asset-path}images/icons/logical-volume.svg') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    &.icon--warning {
+      background: url('#{$asset-path}images/icons/warning.svg') no-repeat;
+      background-size: 100% 100%;
+
+      &-mono {
+        background: url('#{$asset-path}images/icons/warning-mono.svg') no-repeat;
+      }
+    }
+
+    &.icon--open {
+      background: url('#{$asset-path}images/forms/chevron-down.svg') no-repeat;
+      background-size: 10px 4px;
+      background-position: center 4px;
+    }
+
+    &.icon--close {
+      background: url('#{$asset-path}images/forms/chevron-up.svg') no-repeat;
+      background-size: 10px 4px;
+      background-position: center 4px;
+    }
+
+    &--status-failed {
+      //scss-lint:disable PlaceholderInExtend
+      @extend .icon;
+      //scss-link:enable PlaceholderInExtend
+      content: url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#{$status-failed}" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#{$status-failed}" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>');
+    }
+
+    &--status-in-progress {
+      //scss-lint:disable PlaceholderInExtend
+      @extend .icon;
+      //scss-link:enable PlaceholderInExtend
+      content: url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#{$status-in-progress}" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#{$status-in-progress}" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>');
+    }
+
+    &--status-queued {
+      //scss-lint:disable PlaceholderInExtend
+      @extend .icon;
+      //scss-link:enable PlaceholderInExtend
+      content: url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#{$status-queued}" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#{$status-queued}" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>');
+    }
+
+    &--status-succeeded {
+      //scss-lint:disable PlaceholderInExtend
+      @extend .icon;
+      //scss-link:enable PlaceholderInExtend
+      content: url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#{$status-succeeded}" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#{$status-succeeded}" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>');
+    }
+
+    &--status-waiting {
+      //scss-lint:disable PlaceholderInExtend
+      @extend .icon;
+      //scss-link:enable PlaceholderInExtend
+      content: url('data:image/svg+xml;utf8, <svg width="16px" height="16px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="status-queued" transform="translate(1, 1)"><g id="Page-1"><g id="status-queued"><g id="Group"><circle id="Oval" stroke="#{$status-waiting}" stroke-width="2" cx="6" cy="6" r="6"></circle><circle id="Oval-Copy" class="status-circle" fill="#{$status-waiting}" cx="6" cy="6" r="4"></circle></g></g></g></g></g></svg>');
+    }
+  }
+
+  /// Set a specific icon size
+  .icon--small {
+    @include icon-size(14px);
+  }
+
+  .icon--large {
+    @include icon-size(20px);
+  }
+
+  .icon--mega {
+    @include icon-size(23px);
+  }
+
+  .icon--gigantic {
+    @include icon-size(32px);
+  }
+
+  /// Icon alignment for headings / text
+  h1 {
+
+    .icon {
+      margin-top: -6px;
+    }
+  }
+
+  h2,
+  h3 {
+
+    .icon {
+      margin-top: -5px;
+    }
+  }
+
+  h4,
+  h5,
+  p,
+  label,
+  button,
+  a,
+  th,
+  td,
+  .table__header,
+  .table__data {
+
+    .icon {
+      margin-top: -3px;
+    }
+  }
+}
+
+@mixin icon-size($size) {
+  width: $size;
+  height: $size;
+}

=== added file 'src/maasserver/static/scss/_components.tables.scss.OTHER'
--- src/maasserver/static/scss/_components.tables.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/_components.tables.scss.OTHER	2017-04-25 09:34:40 +0000
@@ -0,0 +1,668 @@
+////
+/// @author       Web Team at Canonical Ltd
+/// @link         http://ubuntudesign.github.io/maas-gui-vanilla-theme/docs/#mixin-maas-table
+/// @since        0.0.3
+////
+
+/// MAAS table styling
+/// @group maas table
+@mixin maas-table {
+  @include tables($alto-grey, $warm-grey, 16px, 13px);
+  @include table-columns(100);
+}
+
+// scss-lint:disable SelectorFormat
+@mixin tables($table-border-color, $table-header-color, $table-font-size, $table-header-size) {
+
+  // scss-lint:disable NestingDepth
+
+  // Here is the main placeholder styles for tables. All main elements can be
+  // changed or amended here and will effect standard table markup / class based
+  // div created tables.
+  %table {
+    border-color: $table-border-color;
+    border-spacing: 0;
+    overflow-x: scroll;
+    margin: 0 0 20px;
+    width: 100%;
+    text-align: left;
+    border-collapse: separate;
+
+    // Table row styles
+    %table-row {
+      width: 100%;
+      border-color: rgb(178, 178, 178);
+      border-bottom-style: dotted;
+      border-bottom-width: 1px;
+    }
+
+    // Table cell styles
+    %table-cell {
+      @include font-size($table-font-size);
+      padding: 10px;
+      box-sizing: border-box;
+      min-height: 21px;
+      background: none;
+      border: 0;
+      text-align: left;
+      border-collapse: separate;
+      vertical-align: top;
+      backface-visibility: hidden;
+      position: relative;
+    }
+
+    // Table header row styles
+    %table-header-row {
+      color: $table-header-color;
+      border-bottom: 1px solid;
+
+      &:hover {
+        background-color: transparent;
+      }
+    }
+
+    // Table header cell styles
+    %table-header {
+      @include font-size($table-header-size);
+      background: none;
+      color: $table-header-color;
+      font-size: 13px;
+
+      input {
+
+        &[type="radio"],
+        &[type="checkbox"] {
+
+          + label {
+            margin: 0;
+            top: -3px;
+          }
+        }
+      }
+    }
+
+    // Table header hyperlink styles
+    %table-header-link {
+      color: $table-header-color;
+      border-bottom: 0;
+
+      &:hover {
+        color: $text-color;
+        text-decoration: none;
+      }
+
+      // Sorting and active styles when filtering a table
+      &.is-active {
+        color: $text-color;
+        text-decoration: none;
+      }
+
+      &.is-sorted {
+        border-bottom: 1px solid $text-color;
+      }
+    }
+
+    // Table divide is used for multiple table header options
+    %table-divide {
+      width: 1px;
+      display: inline-block;
+      background: $table-header-color;
+      height: 10px;
+      margin: 0 5px;
+    }
+
+    .numerical {
+      text-align: right;
+    }
+
+    // Generic table form elements, covers general alignment of common form
+    // elements which can be found in all tables.
+    input {
+
+      &[type="radio"],
+      &[type="checkbox"] {
+
+        + label {
+          margin: 0;
+          top: -1px;
+        }
+      }
+    }
+  }
+
+  // Generic table styles, this is to be used for simple display of data which
+  // doesn't reqire dropdowns or form input interaction. Example would be a
+  // listing of machines or generic report information.
+  //
+  // @example
+  // <table>
+  //   <thead>
+  //     <tr>
+  //       <th>...</th>
+  //       ...
+  //     </tr>
+  //   </thead>
+  //   <tfoot>
+  //     <tr>
+  //       <td>...</td>
+  //       ...
+  //     </tr>
+  //   </tfoot>
+  //   <tbody>
+  //     <tr>
+  //       <td>...</td>
+  //       ...
+  //     </tr>
+  //   </tbody>
+  // </table>
+  table {
+    @extend %table;
+
+    tr {
+      @extend %table-row;
+    }
+
+    th,
+    td {
+      @extend %table-cell;
+    }
+
+    th {
+      color: $table-header-color;
+      border-bottom: 1px solid;
+    }
+
+    td {
+      border-color: rgb(178, 178, 178);
+      border-bottom-style: dotted;
+      border-bottom-width: 1px;
+
+      a:link,
+      a:visited {
+        color: $text-color;
+        border-bottom: 1px solid $link-border;
+
+        &:hover {
+          text-decoration: none;
+          color: $link-hover;
+        }
+      }
+    }
+
+    thead {
+      width: 100% !important;
+      display: table-header-group !important;
+
+      tr {
+        @extend %table-header-row;
+      }
+
+      th {
+        @extend %table-header;
+
+        a:link,
+        a:visited {
+          @extend %table-header-link;
+        }
+      }
+
+      &.table__head--sticky {
+        background: $white;
+        padding: 0;
+        width: 100vw !important;
+        left: 0 !important;
+        right: 0 !important;
+        height: auto;
+
+        tr {
+          max-width: $site-max-width;
+          width: 100%;
+          margin: 0 auto;
+          display: block;
+          float: none;
+          border-bottom: 0;
+          overflow: hidden;
+
+          th {
+            border-bottom: 0;
+            float: left;
+          }
+        }
+      }
+
+      .divide {
+        @extend %table-divide;
+      }
+    }
+  }
+
+  // Table styles used to replicate the table layout but where extra interaction
+  // can not be created using standard table elements. This includes in table
+  // form editing, dropdown elements and layouts not possibile using tables.
+  //
+  // @example
+  // <div class="table">
+  //   <header class="table__head">
+  //     <div class="table__row">
+  //       <div class="table__header">...</div>
+  //       ...
+  //     </div>
+  //   </div>
+  //   <footer class="table__footer">
+  //     <div class="table__row">
+  //       <div class="table__data>...</div>
+  //       ...
+  //     </div>
+  //   </footer>
+  //   <section class="table__body">
+  //     <div class="table__row">
+  //       <div class="table__data>...</div>
+  //       ...
+  //     </div>
+  //   </section>
+  // </div>
+  .table {
+    @extend %table;
+    display: table;
+
+    // Table row style
+    .table__row {
+      @extend %table-row;
+      float: left;
+      display: table-row;
+
+      // Table row hover style, this can reveal control elements
+      &:hover {
+        background-color: $white;
+
+        // Set controls z-index and opacity so it is visible
+        .table__controls {
+          z-index: 1;
+          opacity: 1;
+
+          &--secondary {
+            z-index: 1;
+            opacity: 1;
+          }
+        }
+      }
+
+      // Active state on .table__row
+      &.is-active {
+        background-color: $white;
+
+        .table__controls {
+          z-index: 1;
+          opacity: 1;
+
+          &--secondary {
+            z-index: 1;
+            opacity: 1;
+          }
+        }
+
+        .table__dropdown {
+
+          .table__row {
+            display: none;
+
+            &.is-active {
+              display: block;
+            }
+          }
+        }
+      }
+    }
+
+    .table__header,
+    .table__data {
+      @extend %table-cell;
+      display: table-cell;
+      float: left;
+    }
+
+    .table__data {
+
+      a:link,
+      a:visited {
+        color: $text-color;
+        border-bottom: 1px solid $link-border;
+
+        &:hover {
+          text-decoration: none;
+          color: $link-hover;
+        }
+      }
+    }
+
+    .table__head {
+      display: table-head;
+      width: 100%;
+      box-sizing: border-box;
+      width: auto !important;
+
+      &.table__head--sticky {
+        background: $white;
+        padding: 0;
+        width: 100vw !important;
+        left: 0 !important;
+        right: 0 !important;
+        border-top: 1px dotted $alto-grey;
+        box-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+        height: auto !important;
+
+        .table__row {
+          max-width: $site-max-width;
+          width: 100%;
+          margin: 0 auto;
+          display: block;
+          float: none;
+          border-bottom: 0;
+          overflow: hidden;
+        }
+      }
+
+      .table__row {
+        @extend %table-header-row;
+      }
+
+      .table__header {
+        @extend %table-header;
+
+        .table__header-link {
+          @extend %table-header-link;
+        }
+      }
+
+      .table__header-divide,
+      .divide {
+        @extend %table-divide;
+      }
+    }
+
+    .table__body {
+      display: table-row-group;
+    }
+
+    .table__footer {
+      display: table-footer-group;
+    }
+
+    // Table label style used as secondary information with in a table cell. Can
+    // also be used as a toggle.
+    //
+    // @example
+    // <div class="table__data">
+    //    ...
+    //    <span class="table__label">
+    //        <a href="#">Show more</a>
+    //    </span>
+    // </div>
+    //
+    // <div class="table__data active">
+    //     ...
+    //     <span class="table__label">
+    //         <a href="#">Hide</a>
+    //     </span>
+    // </div>
+    .table__label {
+      clear: both;
+      display: block;
+      margin-top: 5px;
+      line-height: 16px;
+      color: $pale-grey;
+
+      a {
+        color: $pale-grey;
+
+        &:hover {
+          color: $link-color;
+        }
+      }
+
+      &.is-active {
+
+        a {
+          color: $link-color;
+        }
+      }
+    }
+
+    // Table contol container, hidden unless hovered on the table row. Will have
+    // action controls which can effect the parent table row or other actions.
+    //
+    // @example
+    // <div class="table">
+    //     <div class="table__row">
+    //         <div class="table__data">
+    //             ...
+    //         </div>
+    //         <div class="table__data">
+    //             <div class="table__controls">
+    //                 <a href="#">Delete</a>
+    //                 <a href="#">Save</a>
+    //             </div>
+    //         </div>
+    //     </div>
+    // </div>
+    .table__controls {
+      width: 100%;
+      text-align: right;
+      opacity: 0;
+      z-index: -1000;
+
+      &--secondary {