Merge pull request #875 from dod-ccpo/sticky-header-to-review

Add Sticky Header to Task Order Review Page

styles/components/_portfolio_layout.scss

@@ -373,7 +373,8 @@
 }
 
 .portfolio-funding {
-  padding: (2 * $gap) 0;
+  padding: 2 * $gap;
+  padding-top: 0;
 
   .panel {
     @include shadow-panel;
@@ -385,10 +386,6 @@
     margin-bottom: 2 * $gap;
   }
 
-  .portfolio-funding__header {
-    flex-direction: row-reverse;
-  }
-
   .pending-task-order {
     background-color: $color-gold-lightest;
 

styles/components/_sticky_cta.scss

@@ -1,12 +1,10 @@
 .sticky-cta {
-  z-index: 100;
-
-  @include media($small-screen) {
   margin-left: -$gap * 4;
-  }
+  z-index: 10;
 
   @include media($medium-screen) {
     margin-left: -$gap * 5;
+    margin-right: -$gap * 3;
   }
 }
 
@@ -16,14 +14,20 @@
 
 .sticky-cta-container {
   display: flex;
-  justify-content: center;
+  align-items: center;
 
   background-color: $color-gray-lightest;
   border-top: 1px solid $color-gray-lighter;
   border-bottom: 1px solid $color-gray-lighter;
-  padding: 0 40px 0 40px;
+  padding: 0 $gap * 2 0 $gap * 5;
   box-shadow: $box-shadow;
-  margin-bottom: 20px;
+
+  a {
+    margin: $gap $gap * 1.5 $gap 0;
+    width: 19rem;
+    height: 3.2rem;
+    font-size: $small-font-size;
+  }
 }
 
 .sticky-cta-text {
@@ -32,12 +36,4 @@
 
 .sticky-cta-buttons {
   display: flex;
-  justify-content: center;
-
-  button {
-    margin-top: auto;
-    margin-bottom: auto;
-    width: 144px;
-    margin-left: 33px;
-  }
 }

styles/sections/_task_order.scss

@@ -80,7 +80,7 @@
 }
 
 .task-order-summary {
-  margin: $gap * 4;
+  margin-top: $gap * 4;
 
   hr {
     border: 0;
@@ -113,7 +113,7 @@
     margin-left: $gap * 6;
     margin-top: $gap * 3;
     width: 33.77%;
-    max-height: 45rem;
+    height: fit-content;
     background-color: $color-gray-lightest;
   }
 

templates/components/semi_collapsible_text.html

@@ -0,0 +1,15 @@
+{% from "components/icon.html" import Icon %}
+
+{% macro SemiCollapsibleText(paragraph) -%}
+
+  <semi-collapsible-text inline-template>
+    <div>
+      <p v-bind:class="{ 'semi-collapsed' : !open }">
+        {{ paragraph }}
+      </p>
+      <a v-on:click='toggle' v-show="!open" class="right more">More{{ Icon('caret_down') }}</a>
+      <a v-on:click='toggle' v-show="open" class="right more">Less{{ Icon('caret_up') }}</a>
+    </div>
+  </semi-collapsible-text>
+
+{%- endmacro %}

templates/portfolios/base.html

@@ -7,6 +7,7 @@
       {% block portfolio_header %}
         {% include "portfolios/header.html" %}
       {% endblock %}
+
       <div class='portfolio-content'>
         {% block portfolio_content %}{% endblock %}
       </div>

templates/portfolios/header.html

@@ -27,7 +27,7 @@
       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",
+      active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.view_task_order", "task_orders.review_task_order"],
     ) }}
     {{ Link(
       icon='applications',

templates/portfolios/task_orders/index.html

@@ -63,13 +63,12 @@
   </div>
 {% endmacro %}
 
-<div class="portfolio-funding">
 
-  {% call StickyCTA(text="Funding") %}
+{% call StickyCTA(text="Funding") %}
-    <div class='portfolio-funding__header row'>
+    <a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Start a new task order</a>
-      <a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button">Add a new task order</a>
+{% endcall %}
-    </div>
+
-  {% endcall %}
+<div class="portfolio-funding">
 
   {% if not active_task_orders and not pending_task_orders %}
     {{ EmptyState(

templates/portfolios/task_orders/review.html

@@ -1,26 +1,24 @@
-{% extends 'portfolios/base.html' %}
-
 {% from "components/icon.html" import Icon %}
 {% from "components/totals_box.html" import TotalsBox %}
+{% from "components/semi_collapsible_text.html" import SemiCollapsibleText %}
+{% from "components/sticky_cta.html" import StickyCTA %}
 
-{% block content %}
+{% extends 'portfolios/base.html' %}
+
+{% block portfolio_content %}
+  {% call StickyCTA(text="Review Funding") %}
+      <a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
+      <a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Submit task order</a>
+  {% endcall %}
 
   <div class="task-order-summary">
-    <div class="h2">Portfolio Name</div>
 
-    <semi-collapsible-text inline-template>
+    {% set description = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." %}
-      <div>
+
-        <p v-bind:class="{ 'semi-collapsed' : !open }">
+    {{ SemiCollapsibleText(paragraph=description) }}
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-        </p>
-        <a v-on:click='toggle' v-show="!open" class="right more">More{{ Icon('caret_down') }}</a>
-        <a v-on:click='toggle' v-show="open" class="right more">Less{{ Icon('caret_up') }}</a>
-      </div>
-    </semi-collapsible-text>
 
     <hr>
 
-
   <div class="h1">Review your task order</div>
   <p>Check to make sure the information you entered is correct. After submission, you will confirm this task order was signed by a contracting officer. Thereafter, you will be informed as soon as CCPO completes their review.</p>
   <div class="row">