Merge pull request #853 from dod-ccpo/nav-changes

Portfolio navigation changes

templates/portfolios/admin.html

@@ -4,8 +4,6 @@
 {% from "components/text_input.html" import TextInput %}
 {% from 'components/save_button.html' import SaveButton %}
 
-{% set secondary_breadcrumb = "navigation.portfolio_navigation.portfolio_admin" | translate %}
-
 {% block portfolio_content %}
 
   <div v-cloak class="portfolio-admin portfolio-content">

templates/portfolios/base.html

@@ -4,10 +4,6 @@
 
   <div class='portfolio-panel-container'>
     <div class='col col--grow'>
-      {% block portfolio_breadcrumbs %}
-        {% include "portfolios/breadcrumbs.html" %}
-      {% endblock %}
-      <div class='line'></div>
       {% block portfolio_header %}
         {% include "portfolios/header.html" %}
       {% endblock %}

templates/portfolios/breadcrumbs.html

@@ -1,19 +0,0 @@
-{% from "components/icon.html" import Icon %}
-
-<div class="row portfolio-breadcrumbs">
-  <a class="icon-link portfolio-breadcrumbs__home {{ 'icon-link--disabled' if not secondary_breadcrumb }}" href="{{ url_for("applications.portfolio_applications", portfolio_id=portfolio.id) }}">
-    {{ Icon("home") }}
-    <span>
-      {{ portfolio.name }} Portfolio
-    </span>
-  </a>
-  <div class="portfolio-breadcrumbs__crumb">
-    {% if secondary_breadcrumb %}
-      {{ Icon("caret_right", classes="icon--tiny") }}
-      <div class="icon-link icon-link--disabled">
-        {{ secondary_breadcrumb }}
-      </div>
-    {% endif %}
-  </div>
-</div
->

templates/portfolios/header.html

@@ -2,7 +2,7 @@
 {% from "components/tooltip.html" import Tooltip %}
 
 {% macro Link(icon, text, url, active=False) %}
-  <a class='icon-link {{ "active icon-link--disabled" if active }}' href='{{ url }}'>
+  <a class='icon-link {{ "active" if active }}' href='{{ url }}'>
     <div class='col'>
       <div class='icon-link--icon'>{{ Icon(icon) }}</div>
       <div class='icon-link--name'>{{ text }}</div>
@@ -13,24 +13,7 @@
 <div class='portfolio-header row'>
   <div class='col col--grow'>
     <div class='portfolio-header__name'>
-      {{ secondary_breadcrumb or portfolio.name }}
-    </div>
-    <div class='portfolio-header__budget row'>
-      <div class='column-left'>
-        <span>Available budget</span>
-        {{
-          Tooltip(
-            ('portfolios.task_orders.available_budget_help_description' | translate),
-            title=''
-          )
-        }}
-      </div>
-      <div class='portfolio-header__budget--amount'>
-        <span class='portfolio-header__budget--dollars'>
-        </span>
-        <span class='portfolio-header__budget--cents'>
-        </span>
-      </div>
+      <h1>{{ portfolio.name }}</h1>
     </div>
     <div class='row'>
       <div class='column-left'></div>
@@ -40,6 +23,18 @@
       </div>
   </div>
   <div class='row links'>
+    {{ Link(
+      icon='funding',
+      text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
+      url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
+      active=request.url_rule.endpoint == "task_orders.portfolio_funding",
+    ) }}
+    {{ Link(
+      icon='applications',
+      text='navigation.portfolio_navigation.breadcrumbs.applications' | translate,
+      url=url_for("applications.portfolio_applications", portfolio_id=portfolio.id),
+      active=request.url_rule.endpoint == "applications.portfolio_applications",
+    ) }}
     {% if user_can(permissions.VIEW_PORTFOLIO_REPORTS) %}
       {{ Link(
         icon='chart-pie',
@@ -48,12 +43,6 @@
         active=request.url_rule.endpoint == "portfolios.reports",
       ) }}
     {% endif %}
-    {{ Link(
-      icon='dollar-sign',
-      text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
-      url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
-      active=request.url_rule.endpoint == "task_orders.portfolio_funding",
-    ) }}
     {% if user_can(permissions.VIEW_PORTFOLIO_ADMIN) %}
       {{ Link(
         icon='cog',

templates/portfolios/reports/index.html

@@ -3,8 +3,6 @@
 {% from "components/icon.html" import Icon %}
 {% from "components/empty_state.html" import EmptyState %}
 
-{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.reports" | translate %}
-
 {% block portfolio_content %}
 
 <div class='portfolio-reports'>

templates/portfolios/task_orders/index.html

@@ -4,8 +4,6 @@
 
 {% extends "portfolios/base.html" %}
 
-{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %}
-
 {% block portfolio_content %}
 
 {% macro ViewLink(task_order) %}