Merge branch 'master' into dave-branch5

Author: devansXD

app/views/current/dashboard.html

@@ -30,7 +30,6 @@ <h1 class='nhsuk-heading-l'>Welcome back</h1>
   <p class="nhsuk-body nhsuk-body-l"> How will you shape procurement in your trust today? </p>
 
 
-
   </div>
 </div>
 
@@ -45,13 +44,8 @@ <h1 class='nhsuk-heading-l'>Welcome back</h1>
 
 <div class="nhsuk-card nhsuk-card--clickable">
   <div class="nhsuk-card__content">
-    <h3 class="nhsuk-card__heading">
-      Search
-    </h3>
-    <p>Search and compare medical products</p>
-   
-  <p><a href="search">Search now</a></p>
-  
+    <h3 class="nhsuk-card__heading"><a href="search">Search and compare medical technologies</a></h3>
+    <p>Look up a specific product or browse categories to find evidence and peer contact information.</p>
   </div>
 </div>
 
@@ -65,13 +59,8 @@ <h3 class="nhsuk-card__heading">
 
 <div class="nhsuk-card nhsuk-card--clickable">
   <div class="nhsuk-card__content">
-    <h3 class="nhsuk-card__heading">
-       Collaborate
-    </h3>
-    <p>Share evaluations with other NHS trusts</p>
-  
-  <p><a href="quick-share-upload-multiple">Share now</a></p>
-  
+    <h3 class="nhsuk-card__heading"><a href="search">Share your experience with medical technologies</a></h3>
+  <p>Upload your own product trials, case studies, evaluation criteria or business cases.</p>
   </div>
 </div>
 

app/views/current/homepage.html

@@ -12,7 +12,7 @@
 
 
 <a class="nhsuk-button nhsuk-button--reverse" data-module="nhsuk-button" href="sign-in-nhs" draggable="false" role="button" data-nhsuk-button-init="">
- Login
+ Log in
 </a>
 
 
@@ -39,8 +39,8 @@ <h2 class="nhsuk-heading-l">What this service offers</h2>
     <div class="nhsuk-card nhsuk-card--clickable">
       <div class="nhsuk-card__content">
         <h3 class="nhsuk-card__heading nhsuk-heading-s">Centralised evidence</h3>
-        <p>Access data from the most authoritative healthcare sources in one place. This includes NICE HealthTech guidance, ODEP Accreditation, 
-           and MHRA Registration data.</p>
+        <p>Access data from multiple trusted sources in one place. This includes NICE HealthTech guidance, ODEP Accreditation, 
+           NHS documents and MHRA Registration data.</p>
       </div>
 
 

app/views/current/search.html

@@ -13,7 +13,43 @@
 {% block content %}
 
 <!-- ============================================ -->
-<!-- MODE 1: KNOWN-ITEM SEEKING                   -->
+<!-- MODE 1: RE-FINDING                           -->
+<!-- ============================================ -->
+
+
+    <!-- When signed in, show recent activity cards -->
+  <h2 class="nhsuk-heading-l">Your activity</h2>
+    <div class="nhsuk-grid-row nhsuk-card-group">
+      <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
+        <div class="nhsuk-card">
+          <div class="nhsuk-card__content">
+            <h3 class="nhsuk-card__heading nhsuk-heading-s">Your recently viewed items</h3>
+            <ul class="nhsuk-list nhsuk-list--bullet">
+              <li><a href="#">Stryker Mako SmartRobotics</a> — viewed yesterday</li>
+              <li><a href="#">Smith+Nephew PICO 7</a> — viewed 3 days ago</li>
+              <li><a href="#">Medtronic MiniMed 780G</a> — viewed last week</li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
+        <div class="nhsuk-card">
+          <div class="nhsuk-card__content">
+            <h3 class="nhsuk-card__heading nhsuk-heading-s">Your saved items</h3>
+            <ul class="nhsuk-list nhsuk-list--bullet">
+              <li><a href="#">SmartPump 300 Infusion System</a></li>
+              <li><a href="#">Collagen Pro Matrix</a></li>
+            </ul>
+            <p class="nhsuk-body-s nhsuk-u-margin-top-3"><a href="#">View all saved items</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+
+<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
+
+<!-- ============================================ -->
+<!-- MODE 2: KNOWN-ITEM SEEKING                   -->
 <!-- Users who know exactly what they're after    -->
 <!-- ============================================ -->
 <div class="nhsuk-grid-row">
@@ -90,8 +126,9 @@ <h3 class="nhsuk-card__heading nhsuk-heading-s">Saved searches</h3>
 
 <hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
 
+
 <!-- ============================================ -->
-<!-- MODE 2: EXPLORATORY SEEKING                  -->
+<!-- MODE 3: EXPLORATORY SEEKING                  -->
 <!-- Users researching options, may not know      -->
 <!-- exactly what they need                       -->
 <!-- ============================================ -->
@@ -258,7 +295,7 @@ <h3 class="nhsuk-card__heading nhsuk-heading-s">
 <hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
 
 <!-- ============================================ -->
-<!-- MODE 3: DON'T KNOW WHAT YOU NEED TO KNOW    -->
+<!-- MODE 4: DON'T KNOW WHAT YOU NEED TO KNOW    -->
 <!-- Users who may not know the right questions   -->
 <!-- or what evidence matters                     -->
 <!-- ============================================ -->
@@ -274,7 +311,7 @@ <h3 class="nhsuk-card__heading nhsuk-heading-m">
           <a class="nhsuk-card__link" href="#">Value-based procurement explained</a>
         </h3>
         <p class="nhsuk-card__description">
-          How to move beyond lowest-price decisions and evaluate products on outcomes, safety, integration and sustainability
+          Move beyond lowest-price decisions and evaluate products on outcomes, safety, integration and sustainability.
         </p>
       </div>
     </div>
@@ -296,7 +333,7 @@ <h3 class="nhsuk-card__heading nhsuk-heading-m">
           <a class="nhsuk-card__link" href="#">Questions to ask other trusts</a>
         </h3>
         <p class="nhsuk-card__description">
-          A checklist of questions that procurement leads and clinical engineers find most useful when speaking with peers about their experience
+          Find out what questions procurement leads and clinical engineers use when speaking with peers about their experience.
         </p>
       </div>
     </div>