Merge pull request #3377 from uktrade/fix/access-request-styles

fix: update breadcrumb and styles
uktrade · Nov 26, 2024 · b6a722f · b6a722f
2 parents f11f060 + 7864a02
commit b6a722f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/dataworkspace/dataworkspace/static/js/react/components/ConfirmDialog/index.tsx b/dataworkspace/dataworkspace/static/js/react/components/ConfirmDialog/index.tsx
@@ -18,13 +18,17 @@ const ContainerButtonGroup = styled('div')`
 
 const Dialog = styled('dialog')`
   padding: 30px 30px 0px;
-  width: 660px;
+  width: 600px;
 `;
 
 const StyledLink = styled(Link)`
   display: inline-block;
   font-size: 20px;
-  margin-top: 5px;
+`;
+
+const StyledForm = styled('form')`
+  display: flex;
+  align-items: baseline;
 `;
 
 export const ConfirmDialog = (props: ConfirmDialogProps) => {
@@ -43,7 +47,7 @@ export const ConfirmDialog = (props: ConfirmDialogProps) => {
     <Dialog ref={refModal}>
       <H2 size="LARGE">{props.title}</H2>
       <ContainerButtonGroup>
-        <form
+        <StyledForm
           action={props.actionUrl}
           aria-label="form"
           method="GET"
@@ -59,7 +63,7 @@ export const ConfirmDialog = (props: ConfirmDialogProps) => {
           <StyledLink href="javascript:;" onClick={props.onClose}>
             Cancel
           </StyledLink>
-        </form>
+        </StyledForm>
       </ContainerButtonGroup>
     </Dialog>
   );

diff --git a/dataworkspace/dataworkspace/templates/datasets/manage_permissions/review_access.html b/dataworkspace/dataworkspace/templates/datasets/manage_permissions/review_access.html
@@ -34,15 +34,14 @@
         <div class="govuk-grid-column-two-thirds">
           {% include 'design_system/error_summary.html' with form=form %}
             <h1 class="govuk-heading-xl">Review {{full_name}}'s access to {{obj.name}}</h1>
-            <h2 class="govuk-heading-l govuk-!-font-size-27">Requestor</h2>
-            <p class="govuk-body"><strong>{{full_name}}</strong></p>
-            <p class="govuk-body">{{email}}</p>
-            <h2 class="govuk-heading-l govuk-!-font-size-27">Requestor's reason for access</h2>
-            <p class="govuk-body">{{reason_for_access}}</p>
+            <h2 class="govuk-heading-l govuk-!-font-size-27 govuk-!-margin-bottom-4">Requestor</h2>
+            <p class="govuk-body"><strong>{{full_name}}</strong><br />{{email}}</p>
+            <h2 class="govuk-heading-l govuk-!-font-size-27 govuk-!-margin-bottom-4">Requestor's reason for access</h2>
+            <p class="govuk-body govuk-!-margin-bottom-7">{{reason_for_access}}</p>
             {% if eligibility_criteria is not null %}
-            <h2 class="govuk-heading-l govuk-!-font-size-27">Have the eligibility requirements been met?</h2>
+            <h2 class="govuk-heading-l govuk-!-font-size-27 govuk-!-padding-top-0 govuk-!-margin-bottom-4">Have the eligibility requirements been met?</h2>
             <details class="govuk-details govuk govuk-!-margin-bottom-4" data-module="govuk-details">
-              <summary class="govuk-details__summary">
+              <summary class="govuk-details__summary govuk-!-margin-bottom-0">
                 <span class="govuk-details__summary-text">
                   Eligibility requirements needed to access this data
                 </span>
@@ -60,7 +59,7 @@ <h2 class="govuk-heading-l govuk-!-font-size-27">Have the eligibility requiremen
               </div>
             </details>
               {% if is_eligible %}
-                <p class="govuk-body"><strong>The requestor answered that they do meet the eligibility requirements</strong></p>
+                <p class="govuk-body govuk-!-margin-bottom-7"><strong>The requestor answered that they do meet the eligibility requirements</strong></p>
                 {% else %}
                 <p class="govuk-body"><strong>The requestor answered that they do not meet the eligibility requirements</strong></p>
                 <p class="govuk-body govuk-!-margin-bottom-7">You can still grant them access if they have a good reason for it.</p>

diff --git a/dataworkspace/dataworkspace/templates/datasets/search_authorised_users.html b/dataworkspace/dataworkspace/templates/datasets/search_authorised_users.html
@@ -5,7 +5,7 @@
 
 {% block breadcrumbs %}
   <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
+    <div class="govuk-grid-column-full">
       <div class="govuk-breadcrumbs">
         <ol class="govuk-breadcrumbs__list">
           <li class="govuk-breadcrumbs__list-item">
@@ -18,7 +18,12 @@
             <a class="govuk-breadcrumbs__link" href="{{ obj_edit_url }}">Manage this dataset</a>
           </li>
           <li class="govuk-breadcrumbs__list-item">
-            Manage permissions
+          <a class="govuk-breadcrumbs__link" href="{% url 'datasets:edit_permissions' obj.id %}">
+            Manage access
+            </a>
+          </li>
+          <li class="govuk-breadcrumbs__list-item">
+            Add user
           </li>
         </ol>
       </div>