From 962e7d98eee2f3b3f1c354ea11ab7f554de0d6ff Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 24 Sep 2018 16:08:49 -0400 Subject: [PATCH 01/25] link various "learn more" links to the `/help` page --- .../fragments/pending_ccpo_acceptance_alert.html | 12 +++++++++--- templates/fragments/pending_ccpo_approval_modal.html | 9 ++++++--- .../fragments/pending_financial_verification.html | 11 ++++++++--- templates/workspaces/reports/index.html | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/templates/fragments/pending_ccpo_acceptance_alert.html b/templates/fragments/pending_ccpo_acceptance_alert.html index 78ec1707..2e2343f5 100644 --- a/templates/fragments/pending_ccpo_acceptance_alert.html +++ b/templates/fragments/pending_ccpo_acceptance_alert.html @@ -1,3 +1,5 @@ +{% from "components/icon.html" import Icon %} +

We will review and respond to your request in 3 business days. You’ll be notified via email or phone.

@@ -6,6 +8,10 @@ While your request is being reviewed, your next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.

-

- Learn more about the JEDI Cloud Task Order and the Financial Verification process. -

+
+ + {{ Icon('help') }} + Learn more about the JEDI Cloud Task Order and the Financial Verification process. + +
+ diff --git a/templates/fragments/pending_ccpo_approval_modal.html b/templates/fragments/pending_ccpo_approval_modal.html index f414b4ad..ff92203c 100644 --- a/templates/fragments/pending_ccpo_approval_modal.html +++ b/templates/fragments/pending_ccpo_approval_modal.html @@ -30,6 +30,9 @@ Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step.

-

- Learn more about the JEDI Cloud Task Order and the Financial Verification process. -

+
+ + {{ Icon('help') }} + Learn more about the JEDI Cloud Task Order and the Financial Verification process. + +
diff --git a/templates/fragments/pending_financial_verification.html b/templates/fragments/pending_financial_verification.html index 2bbfdf7e..16b2bc1b 100644 --- a/templates/fragments/pending_financial_verification.html +++ b/templates/fragments/pending_financial_verification.html @@ -7,6 +7,11 @@ Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step.

-

- Learn more about the JEDI Cloud Task Order and the Financial Verification process. -

+ +
+ + {{ Icon('help') }} + Learn more about the JEDI Cloud Task Order and the Financial Verification process. + +
+ diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html index 6da7f860..8cc71b9b 100644 --- a/templates/workspaces/reports/index.html +++ b/templates/workspaces/reports/index.html @@ -10,7 +10,7 @@ message="

Track your monthly and cumulative expenditures for your workspace, projects, and environments below.

\

Please note that the projected spend is based on the average expense over the last three completed months and therefore does not account for future changes that might be made in scale or configuration of your cloud services.

", actions=[ - {"label": "Learn More", "href": "/", "icon": "info"} + {"label": "Learn More", "href": "/help", "icon": "info"} ] ) }}
From 5868630e1f6fc25e9584efc860abd04da8aa1837 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 24 Sep 2018 16:09:20 -0400 Subject: [PATCH 02/25] add a public help route --- atst/domain/auth.py | 1 + atst/routes/__init__.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/atst/domain/auth.py b/atst/domain/auth.py index 7575ea11..904708d6 100644 --- a/atst/domain/auth.py +++ b/atst/domain/auth.py @@ -8,6 +8,7 @@ UNPROTECTED_ROUTES = [ "dev.login_dev", "atst.login_redirect", "atst.unauthorized", + "atst.helpdocs", "static", ] diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py index c3bc40a6..100815f7 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -13,6 +13,9 @@ bp = Blueprint("atst", __name__) @bp.route("/") def root(): return render_template("root.html") +@bp.route("/help") +def helpdocs(): + return render_template("help/index.html") @bp.route("/home") From 55b35f56b81a0d6fc75ab4f592eb9201ba3116ab Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 24 Sep 2018 16:10:08 -0400 Subject: [PATCH 03/25] Create a general base layout for public pages Make a separate template for login route --- atst/routes/__init__.py | 4 +- templates/base_public.html | 67 +++++++++++++++++++++++++++++ templates/{root.html => login.html} | 32 +++----------- 3 files changed, 76 insertions(+), 27 deletions(-) create mode 100644 templates/base_public.html rename templates/{root.html => login.html} (57%) diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py index 100815f7..32995091 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -12,7 +12,9 @@ bp = Blueprint("atst", __name__) @bp.route("/") def root(): - return render_template("root.html") + return render_template("login.html") + + @bp.route("/help") def helpdocs(): return render_template("help/index.html") diff --git a/templates/base_public.html b/templates/base_public.html new file mode 100644 index 00000000..5ff93a4a --- /dev/null +++ b/templates/base_public.html @@ -0,0 +1,67 @@ +{% from "components/icon.html" import Icon %} + + + + + + + + {% block title %}JEDI Cloud{% endblock %} + {% assets "css" %} + + {% endassets %} + + + + +
+ +
+ +
+ + {% block content %}{% endblock %} + +
+
+
Joint Enterprise Defense Infrastructure
+ + + {{ Icon('help') }} + JEDI Help + +
+ +
+
JEDI Cloud supported on these web browsers
+
Chrome
Firefox
Safari
Edge
IE11 on Windows 10
IE10 on Windows 7
+
+ +
+ + + + + diff --git a/templates/root.html b/templates/login.html similarity index 57% rename from templates/root.html rename to templates/login.html index 3470362d..5f6fb468 100644 --- a/templates/root.html +++ b/templates/login.html @@ -1,20 +1,10 @@ {% from "components/alert.html" import Alert %} - - - - - - - {% block title %}JEDI Cloud{% endblock %} - {% assets "css" %} - - {% endassets %} - - - +{% extends "base_public.html" %} -
+{% block title %}Sign in | JEDI Cloud{% endblock %} + +{% block content %} -
-
Joint Enterprise Defense Infrastructure
-
-
JEDI Cloud supported on these web browsers
-
Chrome
Firefox
Safari
Edge
IE11 on Windows 10
IE10 on Windows 7
-
- -
- - - +{% endblock %} From 4649832e8e30b476c995994598412d57f598a51e Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 24 Sep 2018 16:10:20 -0400 Subject: [PATCH 04/25] dummy Help page markup --- templates/help/index.html | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 templates/help/index.html diff --git a/templates/help/index.html b/templates/help/index.html new file mode 100644 index 00000000..fa36a346 --- /dev/null +++ b/templates/help/index.html @@ -0,0 +1,57 @@ +{% extends "base_public.html" %} +{% from "components/sidenav_item.html" import SidenavItem %} +{% from "components/alert.html" import Alert %} + +{% block title %}Help | JEDI Cloud{% endblock %} + +{% block content %} +
+
+
    + {{ SidenavItem("Help Topic", + href="/help", + active=g.matchesPath('/help'), + subnav=[ + {"label":"Sub Topic", "href":"/help", "active": False}, + {"label":"Sub Topic", "href":"/help", "active": False}, + {"label":"Another Sub Topic", "href":"/help", "active": False}, + ] + )}} + + + {{ SidenavItem("Another Help Topic", + href="/help", + active=False + )}} + + {{ SidenavItem("One More Help Topic", + href="/help", + active=False + )}} +
+
+ + +
+ {{ Alert('Sample Content', + message='This is a sample help page intended to demonstrate the layout of a JEDI Cloud help documentation page.', + ) }} + +
+
+

+
JEDI Cloud Help Documentation
+ Help Topic +

+
+ +
+

So you see, since we're a small operation, we don't fall into the...uh...jurisdiction of the Empire. So you're part of the mining guild then? No, not actually. Our operation is small enough not to be noticed...which is advantageous for everybody since our customers are anxious to avoid attracting attention to themselves. Aren't you afraid the Empire's going to find out about this little operation and shut you down? That's always been a danger looming like a shadow over everything we've built here. But things have developed that will insure security. I've just made a deal that will keep the Empire out of here forever. We would be honored if you would join us. I had no choice. They arrived right before you did. I'm sorry. I'm sorry, too.

+

Now will you move along, little fella? We're got a lot of work to do. No! No, no! Stay and help you, I will. Find your friend, hmm? I'm not looking for a friend, I'm looking for a Jedi Master. Oohhh. Jedi Master. Yoda. You seek Yoda. You know him? Mmm. Take you to him, I will. Yes, yes. But now, we must eat. Come. Good food. Come. Come, come. Stay here and watch after the camp, Artoo.

+

Well done. Hold them in the security tower - and keep it quiet. Move. What do you think you're doing? We're getting out of here. I knew all along it had to be a mistake. Do you think that after what you did to Han we're going to trust you? I had no choice... What are you doing? Trust him, trust him! Oh, so we understand, don't we, Chewie? He had no choice. I'm just trying to help... We don't need any of your help. H-a-a-a... What? It sounds like Han. There's still a chance to save Han...I mean, at the East Platform... Chewie. I'm terribly sorry about all this. After all, he's only a Wookiee.

+
+
+
+ +
+{% endblock %} From ec5b01f9b828f85b02914ac625289573f3eb18fb Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 24 Sep 2018 16:10:39 -0400 Subject: [PATCH 05/25] Adjust markup and add help link to footer --- templates/footer.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index e715749a..032ec413 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,3 +1,12 @@ +{% from "components/icon.html" import Icon %} + From 88793cab3f43f1bee01cd0b505f3e95ebee58d23 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 24 Sep 2018 16:11:12 -0400 Subject: [PATCH 06/25] refactor topbar a bit so the shield icon and "JEDI Cloud" label are one link --- templates/navigation/topbar.html | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html index 35b87473..21a381db 100644 --- a/templates/navigation/topbar.html +++ b/templates/navigation/topbar.html @@ -2,15 +2,23 @@