Merge remote-tracking branch 'origin/master'

w3c · Aug 12, 2014 · 4cce525 · 4cce525
2 parents d293bf5 + 498ea05
commit 4cce525
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/js/testing-helper.js b/js/testing-helper.js
@@ -113,11 +113,9 @@ accessdb.Models.TestingHelper = function (){
             return count;
         },
         progressUpdate : function (){
-            var current = count + 1;
+            var done = count;
             var all = this.countMore() + count;
-            $("#axsdb-page-test-run progress").attr("max", all);
-            $("#axsdb-page-test-run progress").attr("value", current);
-            $("#axsdb-page-test-run progress").html(current + " of " + all + " Tests finished");
+            $("#axsdb-page-test-run h1 .subheading").html('Progress: ' + done + " of " + all + " Tests finished");
         }
     }
-}
+}
diff --git a/pages/test-run.html b/pages/test-run.html
@@ -12,7 +12,7 @@
 				<li><span><span>View Results</span></span></li>
 				<li><span><span>Submit Results</span></span></li>
 			</ol>
-			<h1>Carry out Tests <span class="subheading">Progress: <progress value="0" max="2">0 of 2 Tests finished</progress></span></h1>
+			<h1>Carry out Tests <span class="subheading">Progress: x of y Tests finished</span></h1>
 			<div class="with-filter">
 				<aside class="column-first">
 					<h2 class="information"><span class="icon-info"></span> Information</h2>

diff --git a/pages/tests-run.html b/pages/tests-run.html
@@ -12,7 +12,7 @@
 					<li><span><span>View Results</span></span></li>
 					<li><span><span>Submit Results</span></span></li>
 				</ol>
-				<h1>Run Test Cases</h1>
+				<h1>Select Test Cases</h1>
 				<div class="with-filter">
 					<aside class="column-first" aria-label="Filter results">
 						<div class="column-filters">

diff --git a/templates.html b/templates.html
@@ -55,7 +55,7 @@ <h2>More Information</h2>
                     Plugin: <%= p.plugin.name %> <%= p.plugin.version.text %> <br>
                 <% } %>
                 <% if(p.platform.name) { %>
-                    Operating System: <%= p.platform.name %> <%= p.assistiveTechnology.version.text %>
+                    Operating System: <%= p.platform.name %> <%= p.platform.version.text %>
                 <% } %>
             </label>
         </td>