Просмотр исходного кода

Closes #1490: Rearrange order of items in the virtualization nav menu

Jeremy Stretch 8 лет назад
Родитель
Сommit
90d9eb3520
1 измененных файлов с 6 добавлено и 8 удалено
  1. 6 8
      netbox/templates/_base.html

+ 6 - 8
netbox/templates/_base.html

@@ -205,20 +205,18 @@
                     <li class="dropdown{% if request.path|contains:'/virtualization/' %} active{% endif %}">
                     <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>
                         <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">
                         <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>
                             <li><a href="{% url 'virtualization:virtualmachine_list' %}"><strong>Virtual Machines</strong></a></li>
                             {% if perms.virtualization.add_virtualmachine %}
                             {% 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_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>
                                 <li class="subnav"><a href="{% url 'virtualization:virtualmachine_import' %}"><i class="fa fa-download"></i> Import Virtual Machines</a></li>
                             {% endif %}
                             {% endif %}
                             <li class="divider"></li>
                             <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>
                             <li><a href="{% url 'virtualization:clustertype_list' %}"><strong>Cluster Types</strong></a></li>
                             {% if perms.virtualization.add_clustertype %}
                             {% 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>
                                 <li class="subnav"><a href="{% url 'virtualization:clustertype_add' %}"><i class="fa fa-plus"></i> Add a Cluster Type</a></li>