Fix on Particulars text area Defendant first + sidebar

app/views/cases/indictment/assign/defendants.html

@@ -3,7 +3,7 @@
 {% extends "layouts/main.html" %}
 {% set navId = 'cases' %}
 {% set secondaryNavId = 'indictment' %}
-{% set pageName = 'Assign defendants' %}
+{% set pageName = 'Select defendants for count' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -18,10 +18,14 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
-      <span class="govuk-caption-m">Indictment - Draft count</span>
+      <span class="govuk-caption-m">{{_case.reference}} - {{_case.defendants[0].firstName}} {{_case.defendants[0].lastName}}
+          {% if _case.defendants.length > 1 %}
+            and {{_case.defendants.length - 1}} more
+          {% endif %}
+        </span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
-      <h2 class="govuk-heading-m">Select all defendants that apply to this count</h2>
+      <h2 class="govuk-heading-m">Select all that apply</h2>
 
       <form method="post" novalidate>
         {% if returnTo %}

app/views/cases/indictment/assign/victims.html

@@ -2,7 +2,7 @@
 {% extends "layouts/main.html" %}
 {% set navId = 'cases' %}
 {% set secondaryNavId = 'indictment' %}
-{% set pageName = 'Assign victims' %}
+{% set pageName = 'Select victims for count' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -17,10 +17,14 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
-      <span class="govuk-caption-m">Indictment - Draft count</span>
+      <span class="govuk-caption-m">{{_case.reference}} - {{_case.defendants[0].firstName}} {{_case.defendants[0].lastName}}
+          {% if _case.defendants.length > 1 %}
+            and {{_case.defendants.length - 1}} more
+          {% endif %}
+        </span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
-      <h2 class="govuk-heading-m">Select all victims that apply to this count</h2>
+      <h2 class="govuk-heading-m">Select all that apply</h2>
 
       <form method="post" novalidate>
         {% if returnTo %}

app/views/cases/indictment/assign/witnesses.html

@@ -3,7 +3,7 @@
 {% extends "layouts/main.html" %}
 {% set navId = 'cases' %}
 {% set secondaryNavId = 'indictment' %}
-{% set pageName = 'Assign witnesses' %}
+{% set pageName = 'Select witnesses for count' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -18,10 +18,14 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
-      <span class="govuk-caption-m">Indictment - Draft count</span>
+      <span class="govuk-caption-m">{{_case.reference}} - {{_case.defendants[0].firstName}} {{_case.defendants[0].lastName}}
+          {% if _case.defendants.length > 1 %}
+            and {{_case.defendants.length - 1}} more
+          {% endif %}
+        </span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
-      <h2 class="govuk-heading-m">Select all witnesses that apply to this count</h2>
+      <h2 class="govuk-heading-m">Select all that apply</h2>
 
       <form method="post" novalidate>
         {% if returnTo %}

app/views/cases/indictment/counts/added/index.html

@@ -29,7 +29,7 @@
         }) }}
       {% endif %}
 
-      <span class="govuk-caption-m">Build indictment</span>
+      <span class="govuk-caption-m">{{_case.reference}} - Indictments</span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       <div class="govuk-button-group">

app/views/cases/indictment/counts/charges.html

@@ -3,7 +3,7 @@
 {% extends "layouts/main.html" %}
 {% set navId = 'cases' %}
 {% set secondaryNavId = 'indictment' %}
-{% set pageName = 'Charges' %}
+{% set pageName = 'Select charges for indictment' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -17,8 +17,13 @@
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
+
 
-       <span class="govuk-caption-m">Indictment - Draft count</span>
+       <span class="govuk-caption-m">{{_case.reference}} - {{_case.defendants[0].firstName}} {{_case.defendants[0].lastName}}
+          {% if _case.defendants.length > 1 %}
+            and {{_case.defendants.length - 1}} more
+          {% endif %}
+        </span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       <form method="post" novalidate>

app/views/cases/indictment/counts/check.html

@@ -3,7 +3,7 @@
 {% extends "layouts/main.html" %}
 {% set navId = 'cases' %}
 {% set secondaryNavId = 'indictment' %}
-{% set pageName = 'Check and edit count' %}
+{% set pageName = 'Check count details' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -18,7 +18,11 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
 
-      <span class="govuk-caption-m">Indictment - Draft count</span>
+      <span class="govuk-caption-m">{{_case.reference}} - {{_case.defendants[0].firstName}} {{_case.defendants[0].lastName}}
+          {% if _case.defendants.length > 1 %}
+            and {{_case.defendants.length - 1}} more
+          {% endif %}
+        </span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       {# ----------------------------
@@ -170,7 +174,7 @@ <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
 
       {% set _ = rows.push({
-        key: { text: "Precedent charge or offence" },
+        key: { text: "Precedent" },
         value: precedentRowValue,
         actions: {
           items: [{
@@ -208,7 +212,7 @@ <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       {# Particulars #}
       {% set _ = rows.push({
-        key: { text: "Particulars" },
+        key: { text: "Particulars of offence" },
         value: { text: particularsDisplay },
         actions: {
           items: [{

app/views/cases/indictment/counts/date-and-charges.html

@@ -3,7 +3,7 @@
 {% extends "layouts/main.html" %}
 {% set navId = 'cases' %}
 {% set secondaryNavId = 'indictment' %}
-{% set pageName = 'Charge and date' %}
+{% set pageName = 'Select charge for count' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -17,7 +17,11 @@
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
-       <span class="govuk-caption-m">Indictment - Draft count</span>
+      <span class="govuk-caption-m">{{_case.reference}} - {{_case.defendants[0].firstName}} {{_case.defendants[0].lastName}}
+          {% if _case.defendants.length > 1 %}
+            and {{_case.defendants.length - 1}} more
+          {% endif %}
+        </span>
       <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       <form method="post" novalidate>