Merge pull request #77 from naseberry/master

[WEBDEV-1101] Fix pagination numbers

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pugin-components",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A shunter npm package containing dust components for beta.parliament.uk",
   "main": "index.js",
   "scripts": {

test/fixtures/html/components/navigation/number/card-active.html

@@ -1 +1 @@
-<li class="active" data-number="2"><span><span>Page </span><span class="count">2</span><span>of 77</span></span></li>
+<li class="active" data-number="2"><span><span>Page </span><span class="count__number">2</span><span>of 77</span></span></li>

test/fixtures/html/components/navigation/number/card-not-active.html

@@ -1 +1 @@
-<li data-number="4"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count">4</span><span>of 77</span></a></li>
+<li data-number="4"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count__number">4</span><span>of 77</span></a></li>

test/fixtures/html/components/navigation/number/number.html

@@ -1,9 +1,9 @@
 <nav aria-label="Pagination" class="navigation--number" data-active-tile="2">
   <div class="container"><a class="navigation-control" href="https://beta.parliament.uk/search?count=10&q=hello&start_index=1">Previous</a>
     <ol>
-        <li data-number="1"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count">1</span><span> of 77</span></a></li>
-        <li class="active" data-number="2"><span><span>Page </span><span class="count">2</span><span>of 77</span></span></li>
-        <li data-number="3"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count">3</span><span>of 77</span></a></li>
-        <li data-number="4"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count">4</span><span>of 77</span></a></li>
+        <li data-number="1"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count__number">1</span><span> of 77</span></a></li>
+        <li class="active" data-number="2"><span><span>Page </span><span class="count__number">2</span><span>of 77</span></span></li>
+        <li data-number="3"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count__number">3</span><span>of 77</span></a></li>
+        <li data-number="4"><a href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21"><span>Page </span><span class="count__number">4</span><span>of 77</span></a></li>
     </ol><a class="navigation-control" href="https://beta.parliament.uk/search?count=10&q=hello&start_index=21">Next</a></div>
 </nav>

view/components/navigation/number/card.dust

@@ -4,7 +4,7 @@
   {^data.active}<a href="{data.url|s}">{/data.active}
   {?data.active}<span>{/data.active}
     <span>{@t key="shared.number-navigation.page" /}</span>
-    <span class="count">{data.number}</span>
+    <span class="count__number">{data.number}</span>
     <span>{@t key="{data.total-count}" /}</span>
   {?data.active}</span>{/data.active}
   {^data.active}</a>{/data.active}