Merge pull request #638 from dod-ccpo/reskin-updates

Reskin updates

templates/navigation/global_sidenav.html

@@ -18,17 +18,21 @@
       <div v-if="props.isVisible">
         <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 %}
+          {% if portfolios %}
+            {% 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 %}
+          {% else %}
+            <li><span class="sidenav__text">You have no portfolios yet</span></li>
+          {% endif %}
         </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") }}
+          {{ Icon("plus", classes="sidenav__link-icon icon--circle") }}
         </a>
       </div>
     </div>

templates/portfolios/admin.html

@@ -28,6 +28,6 @@
 
     {% include "fragments/audit_events_log.html" %}
 
-    {{ Pagination(audit_events, 'portfolios.portfolio_activity', portfolio_id=portfolio_id) }}
+    {{ Pagination(audit_events, 'portfolios.portfolio_admin', portfolio_id=portfolio.id) }}
   </div>
 {% endblock %}

templates/portfolios/applications/index.html

@@ -14,7 +14,7 @@
       {% if can_create_applications %}
         <a class='icon-link' href='{{ url_for('portfolios.new_application', portfolio_id=portfolio.id) }}'>
           {{ 'portfolios.applications.add_application_text' | translate }}
-          {{ Icon("plus", classes="sidenav__link-icon") }}
+          {{ Icon("plus", classes="sidenav__link-icon icon--circle") }}
         </a>
       {% endif %}
     </div>

templates/portfolios/applications/members.html

@@ -62,10 +62,10 @@
           <td v-html="member.role"></td>
         </tr>
         <tr>
-          <td colspan=4>
+          <td class="add-member-link" colspan=4>
             <a class="icon-link" href="{{ url_for('portfolios.new_member', portfolio_id=portfolio.id) }}">
               Add A New Member
-              {{ Icon('plus') }}
+              {{ Icon('plus', classes='icon--circle') }}
             </a>
           </td>
         </tr>

templates/portfolios/blank_slate.html

@@ -9,7 +9,7 @@
 {% block content %}
   {{
     EmptyState(
-      action_href=url_for("task_orders.new", screen=1),
+      action_href=url_for("task_orders.get_started"),
       action_label=("portfolios.index.empty.start_button" | translate),
       icon="cloud",
       message=("portfolios.index.empty.title" | translate),

templates/portfolios/breadcrumbs.html

@@ -10,7 +10,7 @@
   <div class="portfolio-breadcrumbs__crumb">
     {% if secondary_breadcrumb %}
       {{ Icon("caret_right", classes="icon--tiny") }}
-      <div class="icon-link">
+      <div class="icon-link icon-link--disabled">
         {{ secondary_breadcrumb }}
       </div>
     {% endif %}

templates/portfolios/header.html

@@ -21,11 +21,11 @@
           {{ Icon('info') }}
         </button>
       </div>
-      <div>
+      <div class='portfolio-header__budget--amount'>
         <span class='portfolio-header__budget--dollars'>
           {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }}
         </span>
-        <span class='cents'>
+        <span class='portfolio-header__budget--cents'>
           .{{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }}
         </span>
       </div>
@@ -70,8 +70,8 @@
       {{ Link(
         icon='cog',
         text='navigation.portfolio_navigation.breadcrumbs.admin' | translate,
-        url=url_for("portfolios.portfolio", portfolio_id=portfolio.id),
-        active=request.url_rule.endpoint == "portfolios.portfolio",
+        url=url_for("portfolios.portfolio_admin", portfolio_id=portfolio.id),
+        active=request.url_rule.endpoint == "portfolios.portfolio_admin",
       ) }}
     {% endif %}
   </div>

templates/portfolios/members/index.html

@@ -95,10 +95,10 @@
           <td v-html="member.role"></td>
         </tr>
         <tr>
-          <td colspan=4>
+          <td class="add-member-link" colspan=4>
             <a class="icon-link" href="{{ url_for('portfolios.new_member', portfolio_id=portfolio.id) }}">
               Add A New Member
-              {{ Icon('plus') }}
+              {{ Icon('plus', classes='icon--circle') }}
             </a>
           </td>
         </tr>

templates/portfolios/reports/index.html

@@ -59,36 +59,42 @@
 
           <hr></hr>
 
-          <div class='to-summary__expiration row'>
-            <div class='col col--grow'>
+          <div class='to-summary__expiration'>
+            <div class='row'>
               <h4 class='subheading'>Expiration Date</h4>
-              <div>
-                {% if expiration_date %}
-                  <local-datetime
-                    timestamp='{{ expiration_date }}'
-                    format='MMMM D, YYYY'>
-                    </local-datetime>
-                {% else %}
-                    -
-                {% endif %}
-              </div>
-              <a href='{{ url_for("portfolios.portfolio_funding", portfolio_id=portfolio.id) }}' class='icon-link'>
-                {{ Icon('cog') }}
-                Manage Task Order
-              </a>
             </div>
-            <div class='col col--grow'>
-              <dl>
-                <dt>Remaining Days</dt>
-                <dd class='{{ 'ending-soon' if remaining_days is not none and remaining_days < 190 }}'>
-                  {% if remaining_days is not none %}
-                    {{ Icon('arrow-down') }}
-                    <span>{{ remaining_days }}</span>
+            <div class='row'>
+
+              <div class='col col--grow'>
+                <div>
+                  {% if expiration_date %}
+                    <local-datetime
+                      timestamp='{{ expiration_date }}'
+                      format='MMMM D, YYYY'>
+                      </local-datetime>
                   {% else %}
-                    -
+                      -
                   {% endif %}
-                </dd>
-              </dl>
+                </div>
+                <a href='{{ url_for("portfolios.view_task_order", portfolio_id=portfolio.id, task_order_id=task_order.id) }}' class='icon-link'>
+                  {{ Icon('cog') }}
+                  Manage Task Order
+                </a>
+              </div>
+              <div class='col col--grow'>
+                <dl>
+                  <dt>Remaining Days</dt>
+                  <dd class='{{ 'ending-soon' if remaining_days is not none }}'>
+                    {% if remaining_days is not none %}
+                      {{ Icon('arrow-down') }}
+                      <span>{{ remaining_days }}</span>
+                    {% else %}
+                      -
+                    {% endif %}
+                  </dd>
+                </dl>
+              </div>
+
             </div>
           </div>
         </div>