Update vaccines list and show pages

Provide link to vaccine show page, and align some of the design with what is in production

Author: paulrobertlloyd

app/locales/en.js

@@ -110,6 +110,7 @@ export const en = {
   batch: {
     new: {
       label: 'Add a new batch',
+      ariaLabel: 'Add a new %s batch',
       title: 'Add batch',
       confirm: 'Add batch',
       success: 'Batch {{batch.id}} added'

app/views/vaccine/list.njk

@@ -11,7 +11,6 @@
 
   {% for vaccine in vaccines %}
     {% call card({
-      feature: true,
       heading: vaccine.brandWithType,
       headingSize: "m",
       href: vaccine.uri
@@ -23,10 +22,12 @@
         })
       }) }}
 
-      {{ button({
+      {{ actionLink({
         text: __("batch.new.label"),
         href: vaccine.uri + "/batches/new",
-        variant: "secondary"
+        attributes: {
+          "aria-label": __("batch.new.ariaLabel", vaccine.brandWithType)
+        }
       }) }}
 
       {% set batchRows = [] %}

app/views/vaccine/show.njk

@@ -1,39 +1,37 @@
 {% extends "_layouts/default.njk" %}
 
-{% set title = vaccine.brandWithName %}
+{% set title = vaccine.brandWithType %}
 {% set paths = { back: "/vaccines" } %}
 
 {% block content %}
-  <div class="nhsuk-u-width-three-quarters">
-    {{ super() }}
+  {{ super() }}
 
-    {{ appHeading({
-      title: title
-    }) }}
+  {{ appHeading({
+    title: title
+  }) }}
 
-    {{ summaryList({
-      card: {
-        heading: vaccine.brand,
-        headingSize: "m",
-        actions: {
-          items: [
-            {
-              text: __("vaccine.show.delete"),
-              href: vaccine.uri + "/delete"
-            }
-          ]
-        }
-      },
-      rows: summaryRows(vaccine, {
-        manufacturer: {},
-        snomed: {},
-        type: {},
-        method: {},
-        dose: {},
-        healthQuestions: {},
-        preScreenQuestions: {},
-        sideEffects: {}
-      })
-    }) }}
-  </div>
+  {{ summaryList({
+    card: {
+      heading: __("vaccine.show.summary"),
+      headingSize: "m",
+      actions: {
+        items: [
+          {
+            text: __("vaccine.show.delete"),
+            href: vaccine.uri + "/delete"
+          }
+        ]
+      }
+    },
+    rows: summaryRows(vaccine, {
+      type: {},
+      brand: {},
+      manufacturer: {},
+      snomed: {},
+      method: {},
+      dose: {},
+      healthQuestions: {},
+      sideEffects: {}
+    })
+  }) }}
 {% endblock %}