Skip to content

Commit 066f43d

Browse files
devansXDdevansXD
authored
Merge pull request #61 from devansXD/daves-branch6
content mostly
2 parents 8185757 + 8eea309 commit 066f43d

File tree

3 files changed

+47
-13
lines changed

3 files changed

+47
-13
lines changed

‎app/views/current/evaluation-choice.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,39 @@ <h2 class="nhsuk-card__heading nhsuk-heading-m">
5555

5656

5757

58+
</div>
59+
60+
</div>
61+
62+
<div class="nhsuk-grid-row">
63+
64+
<div class="nhsuk-grid-column-one-half">
65+
66+
<div class="nhsuk-card nhsuk-card--clickable nhsuk-u-margin-bottom-4">
67+
<div class="nhsuk-card__content">
68+
<h2 class="nhsuk-card__heading nhsuk-heading-m">
69+
<a class="nhsuk-card__link" href="upload-evaluation-criteria">Evaluation criteria</a>
70+
</h2>
71+
<p class="nhsuk-card__description">A set of standards or measures used to assess a medical product.</p>
72+
73+
</div>
74+
</div>
75+
76+
</div>
77+
78+
<div class="nhsuk-grid-column-one-half">
79+
80+
<div class="nhsuk-card nhsuk-card--clickable nhsuk-u-margin-bottom-6">
81+
<div class="nhsuk-card__content">
82+
<h2 class="nhsuk-card__heading nhsuk-heading-m">
83+
<a class="nhsuk-card__link" href="upload-case-study">Case study</a>
84+
</h2>
85+
<p class="nhsuk-card__description">A detailed account of how a medical product was implemented and its outcomes.</p>
86+
</div>
87+
</div>
88+
89+
90+
5891
</div>
5992

6093
</div>

‎app/views/current/search-results-viz-all.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
22

33
{% set pageName = "Search medical technologies - Compass" %}
4-
{% set serviceHeader = "Compass" %}
4+
{% set serviceHeader = "Search medical technologies" %}
55

66
{% block beforeContent %}
77
{% from "breadcrumb/macro.njk" import breadcrumb %}
@@ -134,8 +134,8 @@ <h2 class="nhsuk-contents-list__title nhsuk-u-font-size-16">Subcategory</h2>
134134
<h3 class="nhsuk-heading-s nhsuk-u-margin-bottom-1">Supplier market share</h3>
135135
<p class="nhsuk-body-s nhsuk-u-secondary-text-color nhsuk-u-margin-bottom-4">Advanced dressings only &middot; 52 products</p>
136136

137-
<div class="app-pie-wrap">
138-
<svg class="app-pie-svg" width="140" height="140" viewBox="0 0 140 140" aria-hidden="true">
137+
<div class="app-pie-wrap" style="display:flex;flex-direction:row;align-items:center;gap:20px;">
138+
<svg class="app-pie-svg" width="140" height="140" viewBox="0 0 140 140" aria-hidden="true" style="flex-shrink:0;">
139139
<path d="M70 70 L70 10 A60 60 0 0 1 118 103 Z" fill="#005eb8"/>
140140
<path d="M70 70 L118 103 A60 60 0 0 1 42 127 Z" fill="#007f3b"/>
141141
<path d="M70 70 L42 127 A60 60 0 0 1 14 56 Z" fill="#ffb81c"/>
@@ -145,7 +145,7 @@ <h3 class="nhsuk-heading-s nhsuk-u-margin-bottom-1">Supplier market share</h3>
145145
<text x="70" y="80" text-anchor="middle" font-size="10" fill="#000000">products</text>
146146
</svg>
147147

148-
<div class="app-supplier-legend">
148+
<div class="app-supplier-legend" style="flex:1;min-width:0;">
149149
<div class="app-supplier-legend__item">
150150
<div class="app-supplier-legend__swatch" style="background:#005eb8;"></div>
151151
<div class="app-supplier-legend__body">
@@ -221,7 +221,7 @@ <h3 class="nhsuk-heading-s nhsuk-u-margin-bottom-1">Supplier market share</h3>
221221
<strong class="nhsuk-tag nhsuk-tag--green">New</strong>
222222
</div>
223223
<div class="innovation-row">
224-
<span class="nhsuk-body-s" style="flex:1;"><strong><a href="product-page-wound-care">HealVac NPWT System</a></strong> &mdash; 11 trusts &middot; 2 years old</span>
224+
<span class="nhsuk-body-s" style="flex:1;"><strong><a href="product-page-wound-care?product=aquaseal-foam-dressing">AquaSeal Foam Dressing</a></strong> &mdash; 11 trusts &middot; 2 years old</span>
225225
<strong class="nhsuk-tag nhsuk-tag--blue">Growing</strong>
226226
</div>
227227
</div>
@@ -375,10 +375,10 @@ <h3 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">All wound care products</h3>
375375
<div class="nhsuk-card nhsuk-card--clickable">
376376
<div class="nhsuk-card__content">
377377
<h4 class="nhsuk-card__heading nhsuk-heading-s">
378-
<a class="nhsuk-card__link" href="product-page-wound-care?healvac-npwt-system">HealVac NPWT System</a>
378+
<a class="nhsuk-card__link" href="product-page-wound-care?product=aquaseal-foam-dressing">AquaSeal Foam Dressing</a>
379379
</h4>
380380
<p class="nhsuk-body-s nhsuk-u-secondary-text-color nhsuk-u-margin-bottom-2">
381-
M&ouml;lnlycke Health Care &middot; Advanced dressings &rsaquo; Foam
381+
Advanced Woundcare Therapeutics &middot; Advanced dressings &rsaquo; Foam
382382
</p>
383383
<dl class="nhsuk-summary-list">
384384
<div class="nhsuk-summary-list__row">

‎app/views/index.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,20 @@ <h2 class="nhsuk-heading-m">Procurement team journey - current (v4)</h2>
4343

4444

4545
<ul class="nhsuk-list">
46+
<li><a href="current/homepage">Homepage</a></li>
4647
<li><a href="current/sign-up-trusts-1">Sign up</a></li>
4748
<li><a href="current/sign-in-nhs">Sign in</a></li>
4849
<li><a href="current/sign-in">Sign in non NHS</a></li>
49-
<li><a href="current/homepage">Homepage</a></li>
50-
<li><a href="current/dashboard">Trust dashboard</a></li>
51-
<li><a href="current/quick-share-upload">Share single evaluation</a></li>
52-
<li><a href="current/quick-share-upload-multiple">Share multiple evaluations</a></li>
53-
<li><a href="current/search">Search for a product or supplier</a></li>
50+
51+
<li><a href="current/dashboard">Dashboard</a></li>
52+
<li><a href="current/quick-share-upload-multiple">Share evaluation</a></li>
53+
<li><a href="current/upload-business-case">Share business case</a></li>
54+
<li><a href="current/search">Search</a></li>
5455
<li><a href="current/categories">Product categories a-z</a></li>
5556
<li><a href="current/search-results">Search results keyword</a></li>
5657
<li><a href="current/category-wound-care">Search results category</a></li>
5758
<li><a href="current/product-page">Product page 1</a></li>
58-
<li><a href="current/product-detail">Product page 2</a></li>
59+
<li><a href="current/product-page-wound-care">Product page 2</a></li>
5960
<li><a href="current/search-results-viz-all">Search results visualisation <span class="nhsuk-tag nhsuk-tag--grey nhsuk-u-margin-left-5">experimental</span></a></li>
6061
<li><a href="current/search-results-viz-sub-cat">Search results subcategory visualisation <span class="nhsuk-tag nhsuk-tag--grey nhsuk-u-margin-left-5">experimental</span></a></li>
6162
<li><a href="current/search-results-dashboard">Data Dashboard <span class="nhsuk-tag nhsuk-tag--grey nhsuk-u-margin-left-5">experimental</span></a></li>

0 commit comments

Comments
 (0)