Merge remote-tracking branch 'origin/master'

Conflicts: js/testresult-views.js templates.html
w3c · Jun 3, 2014 · f53d1a6 · f53d1a6
2 parents 0f6a169 + 018a01c
commit f53d1a6
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 52 deletions.
diff --git a/css/wai-act.css b/css/wai-act.css
@@ -992,63 +992,68 @@ pre[class*="language-"] {
   background-color: #eee;
   vertical-align: top;
 }
-/* line 233, ../sass/_asd.scss */
+/* line 232, ../sass/_asd.scss */
+.results tbody th a {
+  font-weight: normal;
+  color: inherit;
+}
+/* line 237, ../sass/_asd.scss */
 .results tbody.collapsed + .testcases {
   display: none;
 }
-/* line 239, ../sass/_asd.scss */
+/* line 243, ../sass/_asd.scss */
 .results .result .btn, .results .result .btn-primary, .results .result .btn-small {
   display: block;
 }
-/* line 241, ../sass/_asd.scss */
+/* line 245, ../sass/_asd.scss */
 .results .result .btn > span, .results .result .btn-primary > span, .results .result .btn-small > span {
   float: right;
 }
 
-/* line 248, ../sass/_asd.scss */
+/* line 252, ../sass/_asd.scss */
 .empty {
   border-bottom-width: 0;
   border-top: none;
 }
-/* line 251, ../sass/_asd.scss */
+/* line 255, ../sass/_asd.scss */
 tr:last-child .empty {
   border-bottom-width: 1px;
 }
 
-/* line 256, ../sass/_asd.scss */
+/* line 260, ../sass/_asd.scss */
 .admin {
   background-color: #Fd9;
 }
 
-/* line 260, ../sass/_asd.scss */
+/* line 264, ../sass/_asd.scss */
 div.admin {
   padding: .5em;
 }
 
-/* line 265, ../sass/_asd.scss */
+/* line 269, ../sass/_asd.scss */
 .environments .col1 {
   width: 1em;
   text-align: right;
 }
-/* line 266, ../sass/_asd.scss */
+/* line 270, ../sass/_asd.scss */
 .environments .col2 {
   width: 20em;
 }
-/* line 267, ../sass/_asd.scss */
+/* line 271, ../sass/_asd.scss */
 .environments .col3 {
   width: 7em;
   text-align: center;
 }
-/* line 268, ../sass/_asd.scss */
+/* line 272, ../sass/_asd.scss */
 .environments .editcol {
   white-space: nowrap;
 }
-/* line 269, ../sass/_asd.scss */
+/* line 273, ../sass/_asd.scss */
 .environments td {
   vertical-align: top;
 }
 
-/* line 272, ../sass/_asd.scss */
+/* line 276, ../sass/_asd.scss */
 .box-note {
   margin-bottom: 2em;
 }

diff --git a/js/testresult-views.js b/js/testresult-views.js
@@ -15,6 +15,9 @@ accessdb.Views.TestResultsDataOverview = function (){
         if(this.results){
             var template = _.template( $("#TestResultsDataOverview_template").html(), {results: this.results} );
             this.$el.html( template );
+            this.$el.find('.chart').peity("pie", {
+                fill: ["green", "#f98"]
+            });
             this.$el.find('button').on('click', function(){
                 var view = new accessdb.Views.TestResultsDataTestCaseOverview();
                 view.$el = $(this);
@@ -63,9 +66,11 @@ accessdb.Views.TestResultsDataTestCaseOverview = function (){
             icon =  this.$el.find('.icon');
             iconlabel = icon.find('.visuallyhidden');
             eltbody.toggleClass('collapsed');
-            console.log(this.results);
             var tctemplate = _.template( $("#TestResultsDataOverviewTestCases_template").html(), {results: this.results} );
             sistertbody.html( tctemplate );
+            sistertbody.find('.chart').peity("pie", {
+                fill: ["green", "#f98"]
+            });
             icon.toggleClass('icon-collapse icon-expand');
             if (icon.is('.icon-expand')) {
                 iconlabel.text('Expand');

diff --git a/pages/admin-techniques.html b/pages/admin-techniques.html
@@ -4,7 +4,7 @@ <h1 class="page-title">
     </h1>
     <nav class="navbar" role="navigation">
         <a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-        <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
     </nav>
     <div class="accessdbUserMessage"></div>
     <div class="roleAdminOnly">
@@ -29,4 +29,4 @@ <h1 class="page-title">
         </div>
     </div>
 
-</article>
+</article>
diff --git a/pages/home.html b/pages/home.html
@@ -3,7 +3,7 @@ <h1 class="page-title">
         Accessibility Support Database
     </h1>
     <nav class="navbar" role="navigation">
-        <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
     </nav>
     <div class="asd-fp-container">
         <div class="main-row">

diff --git a/pages/results.html b/pages/results.html
@@ -4,7 +4,7 @@ <h1 class="page-title">
     </h1>
     <nav class="navbar" role="navigation">
 	<a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
     </nav>
     <div class="content">
 	    <div class="grid">

diff --git a/pages/test-run.html b/pages/test-run.html
@@ -4,7 +4,7 @@ <h1 class="page-title">
 		</h1>
 		<nav class="navbar" role="navigation">
 	<a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
 		</nav>
 		<div class="content">
 			<div class="grid">

diff --git a/pages/test-submit.html b/pages/test-submit.html
@@ -1,16 +1,11 @@
 <article id="axsdb-page-test-submit">
     <h1 class="page-title">
-        <a href="/">Accessibility Support Database</a>
+        Accessibility Support Database
     </h1>
-    <div class="tabbed main navigation">
-        <nav role="navigation" aria-label="Navigation">
-            <ul>
-                <li><a href="#/results.html">View Test Results</a></li>
-                <li><a href="#/tests-run.html">Run Test Cases</a></li>
-                <li class="current"><a href="#/test-submit.html">Submit Test Cases</a></li>
-            </ul>
-        </nav>
-    </div>
+    <nav class="navbar" role="navigation">
+    <a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
+    <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
+    </nav>
     <div class="content">
         <div class="grid">
             <h2>Submit Test Case</h2>
@@ -146,4 +141,4 @@ <h2>Submit Test Case</h2>
             </form>
         </div>
     </div>
-</article>
+</article>
diff --git a/pages/test.html b/pages/test.html
@@ -5,11 +5,11 @@ <h1 class="page-title">
     <nav class="navbar" role="navigation">
         <!--<a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>-->
         <a href="#/tests-run.html" class="btn-small"><span class="icon-arrow-left"></span>Tests Run</a>
-        <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
 
     </nav>
     <div class="content">
         <h2>Test Details</h2>
         <div id="test-details-holder"></div>
     </div>
-</article>
+</article>
diff --git a/pages/tests-finish.html b/pages/tests-finish.html
@@ -4,7 +4,7 @@ <h1 class="page-title">
     </h1>
     <nav class="navbar" role="navigation">
         <a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-        <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
     </nav>
     <div class="content">
         <div class="grid">
@@ -30,4 +30,4 @@ <h3 class="information"><span class="icon-info"></span> Information</h3>
                 </div>
             </div>
         </div>
-</article>
+</article>
diff --git a/pages/tests-run-submit.html b/pages/tests-run-submit.html
@@ -4,7 +4,7 @@ <h1 class="page-title">
 		</h1>
 		<nav class="navbar" role="navigation">
             <a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-            <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	    <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
 		</nav>
 		<div class="content">
 			<div class="grid">
@@ -20,4 +20,4 @@ <h2><span class="icon-ok-sign"></span>Thank you for your submission!</h2>
 				</header>
 			</div>
 		</div>
-    </article>
+    </article>
diff --git a/pages/tests-run.html b/pages/tests-run.html
@@ -5,7 +5,7 @@ <h1 class="page-title">
 		</h1>
 		<nav class="navbar" role="navigation">
             <a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-            <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	    <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
 		</nav>
 		<div class="content">
 			<div class="grid">

diff --git a/pages/user-profile-form.html b/pages/user-profile-form.html
@@ -4,7 +4,7 @@ <h1 class="page-title">
     </h1>
     <nav class="navbar" role="navigation">
         <a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-        <a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+	<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
     </nav>
     <form>
         <input type="hidden" id="testProfileId" value="-1" />
@@ -47,4 +47,4 @@ <h1 class="page-title">
         </fieldset>
         <a style="width: 10em;height: 1.5em;display: block;text-align: center;vertical-align: middle;" href="#/user-profiles.html" class="btn testprofileSave">Save profile</a>
     </form>
-</article>
+</article>
diff --git a/pages/user-profiles.html b/pages/user-profiles.html
@@ -5,7 +5,7 @@ <h1 class="page-title">
 		</h1>
 		<nav class="navbar" role="navigation">
 			<a href="#/home.html" class="btn-small"><span class="icon-home"></span> Home</a>
-			<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span><span class="login-info">Log In</span></a>
+			<a href="#/log-in.html" class="btn-small login"><span class="icon-unlock-alt"></span> <span class="login-info">Log In</span></a>
 		</nav>
 		<div class="content">
 			<div class="grid">

diff --git a/templates.html b/templates.html
@@ -268,8 +268,7 @@ <h4>Test Results</h4>
                     </button>
                 </td>
                 <th scope="row" colspan="2">
-                    <%= r.technique %>: <a href="http://www.w3.org/TR/WCAG20-TECHS/<%= r.technique %>">  <%= r.techniqueTitle %>
-                    <span class="icon-external-link"><span class="visuallyhidden">Link to external page.</span></span></a>
+                    <%= r.technique %>: <a href="http://www.w3.org/TR/WCAG20-TECHS/<%= r.technique %>">  <%= r.techniqueTitle %>&nbsp;<span class="icon-external-link"><span class="visuallyhidden">Link to external page.</span></span></a>
                 </th>
                 <td class="result">
                     <a href="h4.html" class="btn btn-small">
@@ -297,27 +296,19 @@ <h4>Test Results</h4>
                     Test Cases
                 </th>
                 <% first = false %>
-                <% }
-               %>
+                <% } %>
                 <th scope="row">
-                    <%= r.testUnitId %>: <a href="http://www.w3.org/TR/WCAG20-TECHS/<%= r.testUnitId %>">  <%= r.testTitle %>
-                    <span class="icon-external-link"><span class="visuallyhidden">Link to external page.</span></span></a>
+                    <%= r.testUnitId %>: <a href="http://www.w3.org/TR/WCAG20-TECHS/<%= r.testCaseId %>">  <%= r.testTitle %>&nbsp;<span class="icon-external-link"><span class="visuallyhidden">Link to external page.</span></span></a>
                 </th>
-
                 <td class="result">
                     <a href="h4.html" class="btn btn-small">
                         <span class="chart" style="display:none"><%= r.noOfPass %>/<%= r.noOfAll %></span>
-                        <%
-                        console.log("template");
-                        console.log(r);
-                        %>
                         <%= r.noOfPass %>/<%= r.noOfAll %>
                         <span class="icon-arrow-right2">
                             <span class="visuallyhidden">Show results</span>
                         </span>
                     </a>
                 </td>
             </tr>
-
         <% }); %>
 </script>