Merge pull request #11 from naseberry/peterhunt/utilities-search

[WEBDEV-659] Update search results and Version bump
ukparliament · Aug 20, 2018 · 29fc6a9 · 29fc6a9
2 parents 9867401 + 38b5ea7
commit 29fc6a9
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pugin-components",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "A shunter npm package containing dust components for beta.parliament.uk",
   "main": "index.js",
   "scripts": {

diff --git a/test/fixtures/html/components/card/search/search-result.html b/test/fixtures/html/components/card/search/search-result.html
@@ -3,7 +3,7 @@
     <h2><a href=some-url>Result 1</a></h2>
     <ul class="list--inline">
       <li><span class="hint theme--grey-4 ">pdf</span></li>
-      <li class="url">some shorter url</li>
+      <li><span class="url">some shorter url</span></li>
     </ul>
     <p>Some text</p>
   </div>

diff --git a/test/fixtures/html/components/head/link.html b/test/fixtures/html/components/head/link.html
@@ -1,3 +1,3 @@
-<link href="https://static.parliament.uk/pugin/1.10.2/stylesheets/main.css" rel="stylesheet">
+<link href="https://static.parliament.uk/pugin/1.10.4/stylesheets/main.css" rel="stylesheet">
 <link href="https://static.parliament.uk/assets-public/favicon.ico" rel="shortcut icon" type="image/x-icon">
 <link href="http://beta.parliament.uk/search/opensearch" rel="search" title="UK Parliament" type="application/opensearchdescription+xml">
diff --git a/test/fixtures/html/components/list/generic-components.html b/test/fixtures/html/components/list/generic-components.html
@@ -5,7 +5,7 @@
                 <h2><a href=some-url>Result 1</a></h2>
                 <ul class="list--inline">
                     <li><span class="hint theme--grey-4 ">pdf</span></li>
-                    <li class="url">some shorter url</li>
+                    <li><span class="url">some shorter url</span></li>
                 </ul>
                 <p>Some text</p>
             </div>

diff --git a/view/components/card/search/search-result.dust b/view/components/card/search/search-result.dust
@@ -7,14 +7,16 @@
     </h2>
       <ul class="list--inline">
 
-      {! This takes an array of objects, so can render multiple hints. !}
-
-      {?data.hints}
-        {#data.hints}
-          <li>{>"components__hint" data=data /}</li>
+        {! This takes an array of objects, so can render multiple hints. !}
+
+        {?data.hints}
+          {#data.hints}
+            <li>{>"components__hint" data=data /}</li>
+          {/data.hints}
         {/data.hints}
-      {/data.hints}
-      <li class="url">{data.short-url}</li>
+        <li>
+          <span class="url">{data.short-url}</span>
+        </li>
       </ul>
     <p>{data.paragraph-content}</p>
   </div>

diff --git a/view/components/head/link.dust b/view/components/head/link.dust
@@ -1,3 +1,3 @@
-<link href="https://static.parliament.uk/pugin/1.10.2/stylesheets/main.css" rel="stylesheet">
+<link href="https://static.parliament.uk/pugin/1.10.4/stylesheets/main.css" rel="stylesheet">
 <link href="https://static.parliament.uk/assets-public/favicon.ico" rel="shortcut icon" type="image/x-icon">
 <link href="http://beta.parliament.uk/search/opensearch" rel="search" title="UK Parliament" type="application/opensearchdescription+xml">
diff --git a/view/layout.dust b/view/layout.dust
@@ -31,7 +31,7 @@
         {>"components__{name}" name=name data=data/}
       {/footer-components}
     </footer>
-    {! <script src="https://static.parliament.uk/pugin/1.10.0/javascripts/main.js"></script> !}
+    {! <script src="https://static.parliament.uk/pugin/1.10.4/javascripts/main.js"></script> !}
     {>"components__foot__script" /}
   </body>
 </html>