From 067c788df713b379959e46ba7b5de335447ea6c2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 12 Apr 2019 10:16:34 -0400
Subject: [PATCH] Add changelog tabs for power panel, power feed & clean up nav
 links

---
 netbox/dcim/urls.py                   |  2 +-
 netbox/templates/dcim/powerfeed.html  | 10 ++++++
 netbox/templates/dcim/powerpanel.html | 10 ++++++
 netbox/templates/inc/nav_menu.html    | 49 +++++++++++++--------------
 4 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 82e32dad2..220f4b405 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -290,7 +290,7 @@ urlpatterns = [
     url(r'^power-panels/(?P<pk>\d+)/delete/$', views.PowerPanelDeleteView.as_view(), name='powerpanel_delete'),
     url(r'^power-panels/(?P<pk>\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}),
 
-    # Racks
+    # Power feeds
     url(r'^power-feeds/$', views.PowerFeedListView.as_view(), name='powerfeed_list'),
     url(r'^power-feeds/add/$', views.PowerFeedEditView.as_view(), name='powerfeed_add'),
     url(r'^power-feeds/import/$', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'),
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index f2c16927b..18af53350 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -45,6 +45,16 @@
     </div>
     <h1>{% block title %}{{ powerfeed }}{% endblock %}</h1>
     {% include 'inc/created_updated.html' with obj=powerfeed %}
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ powerfeed.get_absolute_url }}">Cable</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url 'dcim:powerfeed_changelog' pk=powerfeed.pk %}">Changelog</a>
+            </li>
+        {% endif %}
+    </ul>
 {% endblock %}
 
 {% block content %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 88f90ae89..282582061 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -44,6 +44,16 @@
     </div>
     <h1>{% block title %}{{ powerpanel }}{% endblock %}</h1>
     {% include 'inc/created_updated.html' with obj=powerpanel %}
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ powerpanel.get_absolute_url }}">Cable</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url 'dcim:powerpanel_changelog' pk=powerpanel.pk %}">Changelog</a>
+            </li>
+        {% endif %}
+    </ul>
 {% endblock %}
 
 {% block content %}
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 8d6fa3439..76dc61ef3 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -371,6 +371,7 @@
                 <li class="dropdown{% if request.path|contains:'/dcim/power' %} active{% endif %}">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Power <span class="caret"></span></a>
                     <ul class="dropdown-menu">
+                        <li class="dropdown-header">Power</li>
                         <li{% if not perms.dcim.view_powerfeed %} class="disabled"{% endif %}>
                             {% if perms.dcim.add_powerfeed %}
                                 <div class="buttons pull-right">
@@ -391,31 +392,29 @@
                         </li>
                     </ul>
                 </li>
-                {% if request.user.is_authenticated %}
-                    <li class="dropdown{% if request.path|contains:'/secrets/' %} active{% endif %}">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Secrets <span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li class="dropdown-header">Secrets</li>
-                            <li>
-                                {% if perms.secrets.add_secret %}
-                                    <div class="buttons pull-right">
-                                        <a href="{% url 'secrets:secret_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
-                                    </div>
-                                {% endif %}
-                                <a href="{% url 'secrets:secret_list' %}">Secrets</a>
-                            </li>
-                            <li>
-                                {% if perms.secrets.add_secretrole %}
-                                    <div class="buttons pull-right">
-                                        <a href="{% url 'secrets:secretrole_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
-                                        <a href="{% url 'secrets:secretrole_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
-                                    </div>
-                                {% endif %}
-                                <a href="{% url 'secrets:secretrole_list' %}">Secret Roles</a>
-                            </li>
-                        </ul>
-                    </li>
-                {% endif %}
+                <li class="dropdown{% if request.path|contains:'/secrets/' %} active{% endif %}">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Secrets <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li class="dropdown-header">Secrets</li>
+                        <li{% if not perms.secrets.view_secret %} class="disabled"{% endif %}>
+                            {% if perms.secrets.add_secret %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'secrets:secret_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
+                            <a href="{% url 'secrets:secret_list' %}">Secrets</a>
+                        </li>
+                        <li{% if not perms.secrets.view_secretrole %} class="disabled"{% endif %}>
+                            {% if perms.secrets.add_secretrole %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'secrets:secretrole_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
+                                    <a href="{% url 'secrets:secretrole_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
+                            <a href="{% url 'secrets:secretrole_list' %}">Secret Roles</a>
+                        </li>
+                    </ul>
+                </li>
             </ul>
             {% endif %}
             <ul class="nav navbar-nav navbar-right">