Version 1.4.0

Conflicts:
	view/partial/tasks.html

README.md

@@ -3,7 +3,7 @@ pa11y-dashboard
 
 pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down.
 
-**Current Version:** *1.3.0*  
+**Current Version:** *1.4.0*  
 **Build Status:** [![Build Status][travis-img]][travis]  
 **Node Version Support:** *0.10*
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pa11y-dashboard",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"private": true,
 
 	"description": "pa11y-dashboard is a visual web interface to the pa11y accessibility reporter",
@@ -25,7 +25,7 @@
 		"express": "~3.4",
 		"express-hbs": "~0.2",
 		"moment": "~2.2",
-		"pa11y-webservice": "~1.3",
+		"pa11y-webservice": "~1.5",
 		"pa11y-webservice-client-node": "~1.1",
 		"underscore": "~1.5"
 	},

route/new.js

@@ -40,7 +40,8 @@ function route (app) {
 			name: req.body.name,
 			url: req.body.url,
 			standard: req.body.standard,
-			ignore: req.body.ignore || []
+			ignore: req.body.ignore || [],
+			timeout: req.body.timeout
 		};
 		app.webservice.tasks.create(newTask, function (err, task) {
 			if (err) {

route/task/edit.js

@@ -60,6 +60,7 @@ function route (app) {
 				if (err) {
 					task.name = req.body.name;
 					task.ignore = req.body.ignore;
+					task.timeout = req.body.timeout;
 					var standards = getStandards().map(function (standard) {
 						if (standard.title === task.standard) {
 							standard.selected = true;

view/index.html

@@ -16,16 +16,28 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{#content "title"}}pa11y-dashboard{{/content}}
 
-{{#if siteMessage}}
+<div data-control="task-list">
+
+  <div class="clearfix">
+    <div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
+      <label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
+      </label>
+      <div id="filter-input" class="collapse">
+        <input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>
+      </div>
+    </div>
+  </div>
+
+  {{#if siteMessage}}
       <div class="col-md-12 clearfix" data-test="alert">
           <div class="alert alert-info site-message">
               <h3 class="crunch-top"><span class="pull-left glyphicon glyphicon-exclamation-sign"></span> Important</h3>
               <p class="h5">{{siteMessage}}</p>
           </div>
       </div>
-{{/if}}
+  {{/if}}
 
-{{#deleted}}
+  {{#deleted}}
       <div class="col-md-12 clearfix" data-test="alert">
           <div class="alert alert-info">
               <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>
@@ -33,6 +45,8 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
               <p>The URL you selected and its associated results have been deleted.</p>
           </div>
       </div>
-{{/deleted}}
+  {{/deleted}}
 
-{{> tasks}}
+  {{> tasks}}
+
+</div>

view/new.html

@@ -65,6 +65,15 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-timeout">Timeout (milliseconds)</label>
+				<input class="form-control" id="new-task-timeout" type="text" placeholder="E.g. 30000" name="timeout" value="{{task.timeout}}"/>
+			</div>
+		</div>
+	</div>
+
 	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">

view/partial/tasks.html

@@ -15,17 +15,7 @@ You should have received a copy of the GNU General Public License
 along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
-<div data-control="task-list">
+<ul class="list-unstyled clearfix crunch-bottom">
-
-	<div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
-		<label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
-		</label>
-		<div id="filter-input" class="collapse">
-			<input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>
-		</div>
-	</div>
-
-	<ul class="list-unstyled clearfix crunch-bottom">
 	<li class="col-md-4 col-sm-6 task-card add-task">
 		{{#if readonly}}
 			<span class="well task-card-link crunch-bottom">
@@ -70,6 +60,4 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 			{{/unless}}
 		</li>
 	{{/each}}
-	</ul>
+</ul>
-
-</div>

view/task/edit.html

@@ -77,6 +77,15 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-timeout">Timeout (milliseconds)</label>
+				<input class="form-control" id="new-task-timeout" type="text" placeholder="E.g. 30000" name="timeout" value="{{task.timeout}}"/>
+			</div>
+		</div>
+	</div>
+
 	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">