Merge branch 'master' into view-task-order

This commit is contained in:
patricksmithdds
2019-01-11 13:35:37 -05:00
committed by GitHub
11 changed files with 30 additions and 47 deletions

View File

@@ -15,7 +15,6 @@
JEDI Cloud provides commercial Infrastructure as a Service (IaaS) and Platform as a Service (PaaS) offerings to support DoD business and mission operations.<br>
<b>Anyone with a DoD mission may use JEDI</b>.
</p>
<a class="usa-button" href="{{ url_for('requests.requests_form_new', screen=1) }}"><span>New JEDI Request</span></a>
<h2>Five Steps to the JEDI Cloud</h2>
@@ -27,7 +26,6 @@
<h3 class="h4">Complete a JEDI Cloud Access Request</h3>
<p>
A JEDI Cloud Access Request will inform the the Cloud Computing Program Office (CCPO) about your intention to use JEDI's commercial cloud services and provide the preliminary information needed to grant access.
Any DoD employee with a CAC may initiate this request. <a class="icon-link" href="{{ url_for('requests.requests_form_new', screen=1) }}">Start a Request</a>
</p>
</li>
<li>

View File

@@ -2,15 +2,6 @@
<div class="global-navigation sidenav {% if workspace %}global-navigation__context--workspace{% endif %}">
<ul>
{{ SidenavItem("Requests",
href="/requests",
icon="document",
active=g.matchesPath('/requests'),
subnav=[
{"label":"New Request", "href":url_for("requests.requests_form_new", screen=1), "icon": "plus", "active": g.matchesPath('/requests/new')},
]
) }}
{{ SidenavItem("New Task Order",
href=url_for("task_orders.new", screen=1),
icon="plus",

View File

@@ -53,10 +53,6 @@
</p>
{% endif %}
<a href="{{ url_for('requests.requests_form_new', screen=1) }}" class='menu__button usa-button'>
{{ "navigation.topbar.request_workspace_link_text" | translate }}
</a>
</div>
</template>
</div>