Display step count in Next button

As a side effect, '2/6.' becomes '2/6' but doing differently would
bloated the code too much to be worth it.

wiki/src/install/inc/steps/download_2.inline.html

@@ -97,15 +97,18 @@
           <span class="upgrade-tails">[[Skip verification|upgrade/tails]]</span>
         </div>
         <div id="next-direct">
-          <div class="btn btn-primary debian windows linux mac-usb mac-dvd dvd vm upgrade-tails">
+          <div class="btn btn-primary debian windows linux mac-usb mac-dvd upgrade-tails">
             <span class="debian">[[Next: Install <em>Tails Installer</em>|debian/usb]]</span>
             <span class="windows">[[Next: Install an intermediary Tails|win/usb]]</span>
             <span class="linux">[[Next: Install an intermediary Tails|linux/usb]]</span>
             <span class="mac-usb">[[Next: Install an intermediary Tails|mac/usb]]</span>
             <span class="mac-dvd">[[Next: Burn a Tails DVD|mac/dvd]]</span>
+            <span class="upgrade-tails">[[Next: Install an intermediary Tails|upgrade/tails]]</span>
+            (<span class="next-counter"></span>)
+          </div>
+          <div class="btn btn-primary dvd vm">
             <span class="dvd">[[Next: Burning Tails on a DVD|dvd]]</span>
             <span class="vm">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>
-            <span class="upgrade-tails">[[Next: Install an intermediary Tails|upgrade/tails]]</span>
           </div>
           <ul class="download-only">
             <li>[[From Windows|install/win/usb]]</li>
@@ -168,15 +171,18 @@
         <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
       </div>
       <div id="next-bittorrent">
-        <div class="btn btn-primary debian windows linux mac-usb mac-dvd upgrade-tails dvd vm">
+        <div class="btn btn-primary debian windows linux mac-usb mac-dvd upgrade-tails">
           <span class="debian">[[Next: Install <em>Tails Installer</em>|debian/usb]]</span>
           <span class="windows">[[Next: Install an intermediary Tails|win/usb]]</span>
           <span class="linux">[[Next: Install an intermediary Tails|linux/usb]]</span>
           <span class="mac-usb">[[Next: Install an intermediary Tails|mac/usb]]</span>
           <span class="mac-dvd">[[Next: Burn a Tails DVD|mac/dvd]]</span>
+          <span class="upgrade-tails">[[Next: Install an intermediary Tails|upgrade/tails]]</span>
+          (<span class="next-counter"></span>)
+        </div>
+        <div class="btn btn-primary dvd vm">
           <span class="dvd">[[Next: Burning Tails on a DVD|dvd]]</span>
           <span class="vm">[[Next: Virtualization|doc/advanced_topics/virtualization]]</span>
-          <span class="upgrade-tails">[[Next: Install an intermediary Tails|upgrade/tails]]</span>
         </div>
         <ul class="download-only">
           <li>[[From Windows|install/win/usb]]</li>

wiki/src/install/inc/stylesheets/debian.css

@@ -12,6 +12,6 @@ li.debian {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/6';
 }

wiki/src/install/inc/stylesheets/expert.css

@@ -30,8 +30,8 @@ div.note p.pre {
   width: 32em;
 }
 
-h1:before {
-  content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/7';
 }
 
 h1 {

wiki/src/install/inc/stylesheets/install-clone.css

@@ -12,6 +12,6 @@ li.install-clone {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/6';
 }

wiki/src/install/inc/stylesheets/linux.css

@@ -12,6 +12,6 @@ li.linux {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/7';
 }

wiki/src/install/inc/stylesheets/mac-clone.css

@@ -13,6 +13,6 @@ li.mac-clone {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/6';
 }

wiki/src/install/inc/stylesheets/mac-dvd.css

@@ -13,6 +13,6 @@ li.mac-dvd {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/7';
 }

wiki/src/install/inc/stylesheets/mac-usb.css

@@ -13,6 +13,6 @@ li.mac-usb {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/7';
 }

wiki/src/install/inc/stylesheets/steps.css

@@ -16,14 +16,13 @@ body {
   counter-reset: step;
 }
 
-div.hidden-step-1 {
+h1, div.hidden-step-1, span.next-counter {
   counter-increment: step;
 }
 
 h1:before {
   position: relative;
   font-size: 0.75em;
-  counter-increment: step;
   display: inline-block;
   width: 60px;
 }

wiki/src/install/inc/stylesheets/upgrade-clone.css

@@ -13,6 +13,6 @@ li.upgrade-clone {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/4.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/4';
 }

wiki/src/install/inc/stylesheets/upgrade-tails.css

@@ -12,6 +12,6 @@ li.upgrade-tails {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/6.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/6';
 }

wiki/src/install/inc/stylesheets/windows.css

@@ -12,6 +12,6 @@ li.windows {
   display: list-item;
 }
 
-h1:before {
-  content: counter(step)'/7.';
+h1:before, span.next-counter:before {
+  content: counter(step)'/7';
 }