From 0bf31c6c1372e5fa9d04e9e67201fc402f0f60c6 Mon Sep 17 00:00:00 2001
From: Patrick Smith <patrick+dds@promptworks.com>
Date: Wed, 6 Feb 2019 11:23:43 -0500
Subject: [PATCH] Move portfolio sidenav to global layout

---
 templates/base.html                      |  4 +++-
 templates/navigation/global_sidenav.html | 24 ++++++++++++++++++++++
 templates/portfolios/base.html           | 26 ------------------------
 3 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 templates/navigation/global_sidenav.html

diff --git a/templates/base.html b/templates/base.html
index e69dc1dd..89f56b4a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,7 +21,9 @@
     {% include 'navigation/topbar.html' %}
 
     <div class='global-layout'>
-      {% block global_sidenav %}{% endblock %}
+      {% block global_sidenav %}
+        {% include 'navigation/global_sidenav.html' %}
+      {% endblock %}
 
       <div class='global-panel-container'>
         {% block sidenav %}{% endblock %}
diff --git a/templates/navigation/global_sidenav.html b/templates/navigation/global_sidenav.html
new file mode 100644
index 00000000..00783943
--- /dev/null
+++ b/templates/navigation/global_sidenav.html
@@ -0,0 +1,24 @@
+{% from "components/icon.html" import Icon %}
+{% from "components/sidenav_item.html" import SidenavItem %}
+
+
+<div class="global-navigation sidenav">
+  <div class="sidenav__title">Portfolios</div>
+  <ul class="sidenav__list--padded">
+    {% for other_portfolio in portfolios|sort(attribute='name') %}
+      {{ SidenavItem(other_portfolio.name,
+        href=url_for("portfolios.show_portfolio", portfolio_id=other_portfolio.id),
+        active=(other_portfolio.id | string) == request.view_args.get('portfolio_id')
+        ) }}
+    {% endfor %}
+  </ul>
+  <div class="sidenav__divider--small"></div>
+  <a class="sidenav__link sidenav__link--add" href="{{ url_for("task_orders.get_started") }}" title="Fund a New Portfolio">
+    <span class="sidenav__link-label">Fund a New Portfolio</span>
+    {{ Icon("plus", classes="sidenav__link-icon") }}
+  </a>
+</div>
+
+<div class="global-navigation sidenav--minimized">
+  <div class="sidenav__title">Show >>></div>
+</div>
diff --git a/templates/portfolios/base.html b/templates/portfolios/base.html
index 87b0128c..280e0d0b 100644
--- a/templates/portfolios/base.html
+++ b/templates/portfolios/base.html
@@ -1,31 +1,5 @@
-{% from "components/sidenav_item.html" import SidenavItem %}
-{% from "components/icon.html" import Icon %}
-
 {% extends "base.html" %}
 
-{% block global_sidenav %}
-  <div class="global-navigation sidenav">
-    <div class="sidenav__title">Portfolios</div>
-    <ul class="sidenav__list--padded">
-      {% for other_portfolio in portfolios|sort(attribute='name') %}
-        {{ SidenavItem(other_portfolio.name,
-          href=url_for("portfolios.show_portfolio", portfolio_id=other_portfolio.id),
-          active=other_portfolio == portfolio
-          ) }}
-      {% endfor %}
-    </ul>
-    <div class="sidenav__divider--small"></div>
-    <a class="sidenav__link sidenav__link--add" href="{{ url_for("task_orders.get_started") }}" title="Fund a New Portfolio">
-      <span class="sidenav__link-label">Fund a New Portfolio</span>
-      {{ Icon("plus", classes="sidenav__link-icon") }}
-    </a>
-  </div>
-
-  <div class="global-navigation sidenav--minimized">
-    <div class="sidenav__title">Show >>></div>
-  </div>
-{% endblock %}
-
 {% block content %}
 
   <div class='portfolio-panel-container'>