From 54a28219527e6952ed628f12fe401c45d6e63b8d Mon Sep 17 00:00:00 2001 From: luis cielak Date: Tue, 4 Sep 2018 16:39:26 -0500 Subject: [PATCH 1/8] Update placeholder fields --- templates/request_approval.html | 84 ++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 16 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index ab44c907..04295a83 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% from "components/icon.html" import Icon %} +{% from "components/alert.html" import Alert %} {% block content %} @@ -68,56 +69,107 @@
-

Here is some good text explaining what the CCPO needs to do in order to approve the request. This text should also explain why we are asking for multiple people's names and the risk of boiling the ocean.

+ +
+ +

Comments to End User

+ + You may leave a comment for the end user explaining what changes are being requested or why further discussion is needed about this request. The user can then re-submit the request with your changes requested or may initiate an offline message (via email) to respond to the CCPO directly.
This notes are optional and will be visible to end-users. + +
+ + +
-
- -
+
+
+

Authorizing Officials

+

This section is not visible to the end user. It will only be visible to CCPO staff.

+

Provide the name of the key officials for both parties that have authorized this request to move forward.

+
+
+

Mission Authorizing Official

+
+
- - + +
- + +
+ +
+ + +
+ +
+ +
- +
+
-
+
+ + +

CCPO Authorizing Official

+ +
+
+
- - + +
- + +
+ + + +
+ +
+ +
+ +
- +
+ +
+
+ +
- Approve Request - Deny Request - + Approve Request + Mark as Changes Requested + {{ Icon('x') }} Cancel From 054ff82beb00500ea1acd18fd4ea918087232c8d Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 09:25:38 -0500 Subject: [PATCH 2/8] Replace end-user with requestor --- templates/request_approval.html | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index 04295a83..f16b6dfd 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -72,9 +72,9 @@
-

Comments to End User

+

Comments to Requestor

- You may leave a comment for the end user explaining what changes are being requested or why further discussion is needed about this request. The user can then re-submit the request with your changes requested or may initiate an offline message (via email) to respond to the CCPO directly.
This notes are optional and will be visible to end-users. + You may leave a comment for the requestor explaining what changes are being requested or why further discussion is needed about this request. The requestor can then re-submit the request with your changes requested or may initiate an offline message (via email) to respond to the CCPO directly.
This notes are optional and will be visible to requestors.
@@ -87,7 +87,7 @@

Authorizing Officials

-

This section is not visible to the end user. It will only be visible to CCPO staff.

+

This section is not visible to the requestor. It will only be visible to CCPO staff.

Provide the name of the key officials for both parties that have authorized this request to move forward.

@@ -136,13 +136,6 @@
-
- - -
- - -
@@ -152,12 +145,6 @@
-
- - -
- -
From 447e759277fe88e5e3ae10b0c4bd04e49852f9fd Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 10:02:50 -0500 Subject: [PATCH 3/8] Update placeholder text and remove column layout --- templates/request_approval.html | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index f16b6dfd..aae3d6cb 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -98,27 +98,22 @@
- + +
+ +
+ +
- -
- - - - -
- -
- - +
- +
@@ -129,23 +124,19 @@

CCPO Authorizing Official

-
+
- +
-
- -
-
- +
-
+
From cd7fb852f0ebeb2d2e5467637d48312658bb830c Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 10:25:02 -0500 Subject: [PATCH 4/8] Arrange fields in column layout --- templates/request_approval.html | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index aae3d6cb..99e3e774 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -94,6 +94,7 @@

Mission Authorizing Official

+
@@ -101,16 +102,32 @@
+
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+
@@ -124,6 +141,7 @@

CCPO Authorizing Official

+
@@ -131,18 +149,26 @@
+
+ +
+
-
+
+
- + + + +
Approve Request From 03a1fec6b66d5a19672114d69627f828a0342973 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 11:02:55 -0500 Subject: [PATCH 5/8] Fix layout issues --- templates/request_approval.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index 99e3e774..b15e9d76 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -119,6 +119,7 @@
+
@@ -126,6 +127,7 @@
+
@@ -135,13 +137,14 @@
+ +

CCPO Authorizing Official

-
@@ -149,26 +152,18 @@
-
- -
-
-
+
- - - - -
+
Approve Request From 19f5edfa17cb2efd19c90aa203e0ad3373c13422 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 12:39:01 -0500 Subject: [PATCH 6/8] Set name fields side by side --- templates/request_approval.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index b15e9d76..9fc56ba5 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -144,18 +144,26 @@

CCPO Authorizing Official

-
+ + +
+
- +
+
+ +
+
- +
+
From 937df89fd4ff35f2c366d0f2e8d80885889520d4 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 13:05:21 -0500 Subject: [PATCH 7/8] Add notes field and update copy --- templates/request_approval.html | 35 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index 9fc56ba5..c3df1429 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -72,9 +72,9 @@
-

Comments to Requestor

+

Instructions for the Requestor

- You may leave a comment for the requestor explaining what changes are being requested or why further discussion is needed about this request. The requestor can then re-submit the request with your changes requested or may initiate an offline message (via email) to respond to the CCPO directly.
This notes are optional and will be visible to requestors. + Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. These notes will be visible to the person making the JEDI request.
@@ -87,8 +87,9 @@

Authorizing Officials

-

This section is not visible to the requestor. It will only be visible to CCPO staff.

+

This section is not visible to the person making the request. It is only viewable by CCPO staff.

Provide the name of the key officials for both parties that have authorized this request to move forward.

+

Mission Authorizing Official

@@ -121,7 +122,7 @@
- +
@@ -131,21 +132,17 @@
- +
- -

CCPO Authorizing Official

- -
@@ -168,9 +165,27 @@
-
+

CCPO Internal Notes

+ +

You may add additional comments and notes for internal CCPO reference and follow-up here.

+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+
From a12c033812a52baeb6b78efb102566a5f107912e Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 5 Sep 2018 13:14:33 -0500 Subject: [PATCH 8/8] Add half cols class to eventually get the alignment fixed yo --- templates/request_approval.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/request_approval.html b/templates/request_approval.html index c3df1429..8cb2580a 100644 --- a/templates/request_approval.html +++ b/templates/request_approval.html @@ -96,7 +96,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
@@ -145,7 +145,7 @@
-
+
@@ -154,7 +154,7 @@
-
+