From e97b595d84fd03e0d68781710af3c053292696a0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 15 Sep 2017 11:08:23 -0400
Subject: [PATCH] Closes #1490: Rearrange order of items in the virtualization
 nav menu

---
 netbox/templates/_base.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index ad8afb4b1..3a2cd85d4 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -205,20 +205,18 @@
                     <li class="dropdown{% if request.path|contains:'/virtualization/' %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Virtualization <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{% url 'virtualization:cluster_list' %}"><strong>Clusters</strong></a></li>
-                            {% if perms.virtualization.add_cluster %}
-                                <li class="subnav"><a href="{% url 'virtualization:cluster_add' %}"><i class="fa fa-plus"></i> Add a Cluster</a></li>
-                                <li class="subnav"><a href="{% url 'virtualization:cluster_import' %}"><i class="fa fa-download"></i> Import Clusters</a></li>
-                            {% endif %}
-                            {% if perms.virtualization.add_cluster or perms.virtualization.add_virtualmachine %}
-                                <li class="divider"></li>
-                            {% endif %}
                             <li><a href="{% url 'virtualization:virtualmachine_list' %}"><strong>Virtual Machines</strong></a></li>
                             {% if perms.virtualization.add_virtualmachine %}
                                 <li class="subnav"><a href="{% url 'virtualization:virtualmachine_add' %}"><i class="fa fa-plus"></i> Add a Virtual Machine</a></li>
                                 <li class="subnav"><a href="{% url 'virtualization:virtualmachine_import' %}"><i class="fa fa-download"></i> Import Virtual Machines</a></li>
                             {% endif %}
                             <li class="divider"></li>
+                            <li><a href="{% url 'virtualization:cluster_list' %}"><strong>Clusters</strong></a></li>
+                            {% if perms.virtualization.add_cluster %}
+                                <li class="subnav"><a href="{% url 'virtualization:cluster_add' %}"><i class="fa fa-plus"></i> Add a Cluster</a></li>
+                                <li class="subnav"><a href="{% url 'virtualization:cluster_import' %}"><i class="fa fa-download"></i> Import Clusters</a></li>
+                            {% endif %}
+                            <li class="divider"></li>
                             <li><a href="{% url 'virtualization:clustertype_list' %}"><strong>Cluster Types</strong></a></li>
                             {% if perms.virtualization.add_clustertype %}
                                 <li class="subnav"><a href="{% url 'virtualization:clustertype_add' %}"><i class="fa fa-plus"></i> Add a Cluster Type</a></li>