Merge branch 'master' into ui/responsive-tables

templates/navigation/_sidenav_item.html.to

@@ -6,4 +6,19 @@
 
     <span class="sidenav__link-label">{{label}}</span>
   </a>
+
+  {% if subnav and active %}
+    <ul>
+    {% for item in subnav %}
+      <li>
+        <a class="sidenav__link {% if item["active"] %}sidenav__link--active{% end %}" href="{{item["href"]}}" title="{{item["label"]}}">
+          {% if "icon" in item %}
+            {% module Icon(item["icon"], classes="sidenav__link-icon") %}
+          {% end %}
+          <span class="sidenav__link-label">{{item["label"]}}</span>
+        </a>
+      </li>
+    {% end %}
+    </ul>
+  {% end %}
 </li>

templates/navigation/global_navigation.html.to

@@ -1,10 +1,24 @@
 <div class="global-navigation sidenav global-navigation__context--{{context}}">
   <ul>
     {% if dev() %}
-      {% module SidenavItem("Styleguide", href="/styleguide", icon="visible", active=matchesPath('/styleguide')) %}
+      {% module SidenavItem("Styleguide",
+        href="/styleguide",
+        icon="visible",
+        active=matchesPath('/styleguide'),
+        subnav=[
+          {"label":"Subnav 1", "href":"/styleguide?subnav1", "icon": "plus", "active": matchesPath('/styleguide?subnav1')},
+          {"label":"Subnav 2", "href":"/styleguide?subnav2", "active": matchesPath('/styleguide?subnav2')},
+        ]) %}
     {% end %}
 
-    {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %}
+    {% module SidenavItem("Requests",
+      href="/requests",
+      icon="document",
+      active=matchesPath('/requests'),
+      subnav=[
+        {"label":"New Request", "href":"/requests/new", "icon": "plus", "active": matchesPath('/requests/new')},
+      ]
+      ) %}
     {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
   </ul>
 </div>

templates/requests.html.to

@@ -3,19 +3,27 @@
 {% block content %}
 
 
-
+{% module Alert('Pending Financial Verification',
+  message="<p>Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a Contracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.</p>"
+) %}
 
 <div class="col col--grow">
 
-  <div class="panel">
-
-    <div class="panel__content">
-
-      <div class="panel__heading">
-        <h1>Requests <a class="usa-button usa-button-secondary" href='{{ reverse_url('request_new') }}'>New Request</a></h1>
+  <div class='panel'>
+    <div class='row'>
+      <div class='col col--grow col--pad'>
+        <form class="usa-search usa-search-small">
+          <label class="usa-sr-only" for="search-field-small">Search small</label>
+          <input id="search-field-small" type="search" name="search" placeholder="Search by Order ID">
+          <button type="submit">
+            <span class="usa-sr-only">Search</span>
+          </button>
+        </form>
       </div>
     </div>
-
+  </div>
+  
+  <div class="panel">
     <div class='responsive-table-wrapper'>
       <table>
         <thead>