Bump minimatch and mocha

Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together.


Updates `minimatch` from 3.0.4 to 3.1.2
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

Updates `mocha` from 7.2.0 to 10.2.0
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v7.2.0...v10.2.0)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
- dependency-name: mocha
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.editorconfig

@@ -5,9 +5,19 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-insert_final_newline = true
+indent_size = 4
 indent_style = tab
+insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
+indent_style = spaces
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[package.json]
+indent_style = space
+indent_size = 2

.eslintignore

@@ -1,3 +1,2 @@
 coverage
-node_modules
 public/js

.eslintrc.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('pa11y-lint-config/eslint/es2017');

.github/issue_template.md

@@ -0,0 +1,20 @@
+**This repository's issues are reserved for feature requests, bug reports, and other issues with Pa11y Dashboard itself.**
+
+If you need help using Pa11y Dashboard, we recommend using [Stack Overflow](https://stackoverflow.com/questions/tagged/pa11y).
+
+For a bug report, please use the template below. To keep the backlog clean and actionable, issues may be immediately closed if they do not follow one this template.
+
+---
+
+## Expected behaviour
+
+
+## Actual behaviour
+
+
+## Steps to reproduce
+
+
+## Environment
+
+_Please specify the versions of Pa11y Dashboard, MongoDB, and Node.js that can be sued to reproduce this issue._

.github/workflows/tests.yml

@@ -0,0 +1,44 @@
+name: Build and lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  checkout_and_test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        include:
+          - node-version: 12.x
+            lint: true # Linter is run only once to shorten the total build time
+          - node-version: 14.x
+
+    steps:
+      - name: Checkout code from ${{ github.repository }}
+        uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: MongoDB in GitHub Actions
+        uses: supercharge/mongodb-github-action@1.3.0
+        with:
+          mongodb-version: 3.4
+      - name: Install dependencies
+        run: npm i
+      - name: Run linter
+        if: ${{ matrix.lint }}
+        run: make lint
+      - name: Create test config
+        run: cp config/test.sample.json config/test.json
+      - name: Start test app
+        run: NODE_ENV=test node index.js &
+      - name: Wait / Sleep
+        uses: jakejarvis/wait-action@v0.1.0
+        with:
+          time: '10s'
+      - name: Run tests
+        run: make ci

.gitignore

@@ -7,3 +7,6 @@ config/test.json
 # Generated npm files
 node_modules
 npm-debug.log
+
+# JetBrains IDE
+.idea

.jscsrc

@@ -1,94 +0,0 @@
-{
-	"disallowEmptyBlocks": true,
-	"disallowImplicitTypeConversion": [
-		"binary",
-		"boolean",
-		"numeric",
-		"string"
-	],
-	"disallowKeywordsOnNewLine": [
-		"catch",
-		"else"
-	],
-	"disallowMixedSpacesAndTabs": true,
-	"disallowMultipleSpaces": true,
-	"disallowMultipleVarDecl": true,
-	"disallowNewlineBeforeBlockStatements": true,
-	"disallowParenthesesAroundArrowParam": true,
-	"disallowQuotedKeysInObjects": true,
-	"disallowSpaceAfterObjectKeys": {
-		"allExcept": [
-			"method"
-		]
-	},
-	"disallowSpaceAfterPrefixUnaryOperators": true,
-	"disallowSpaceBeforeComma": true,
-	"disallowSpaceBeforeSemicolon": true,
-	"disallowSpacesInCallExpression": true,
-	"disallowSpacesInFunction": {
-		"beforeOpeningRoundBrace": true
-	},
-	"disallowSpacesInsideArrayBrackets": true,
-	"disallowSpacesInsideBrackets": true,
-	"disallowSpacesInsideObjectBrackets": true,
-	"disallowSpacesInsideParentheses": true,
-	"disallowSpacesInsideTemplateStringPlaceholders": true,
-	"disallowTrailingComma": true,
-	"disallowTrailingWhitespace": true,
-	"disallowVar": true,
-	"disallowYodaConditions": true,
-
-	"maximumLineLength": 100,
-
-	"requireArrowFunctions": true,
-	"requireBlocksOnNewline": true,
-	"requireCamelCaseOrUpperCaseIdentifiers": true,
-	"requireCapitalizedConstructors": true,
-	"requireCommaBeforeLineBreak": true,
-	"requireCurlyBraces": true,
-	"requireDotNotation": true,
-	"requireFunctionDeclarations": true,
-	"requireLineBreakAfterVariableAssignment": true,
-	"requireLineFeedAtFileEnd": true,
-	"requireObjectKeysOnNewLine": true,
-	"requireParenthesesAroundIIFE": true,
-	"requireSemicolons": true,
-	"requireSpaceAfterBinaryOperators": true,
-	"requireSpaceAfterKeywords": [
-		"if",
-		"else",
-		"for",
-		"while",
-		"do",
-		"switch",
-		"try",
-		"catch"
-	],
-	"requireSpaceAfterLineComment": {
-		"allExcept": [
-			"="
-		]
-	},
-	"requireSpaceBeforeBinaryOperators": true,
-	"requireSpaceBeforeBlockStatements": true,
-	"requireSpaceBeforeObjectValues": true,
-	"requireSpaceBetweenArguments": true,
-	"requireSpacesInConditionalExpression": true,
-	"requireSpacesInForStatement": true,
-	"requireSpacesInFunction": {
-		"beforeOpeningCurlyBrace": true
-	},
-	"requireTemplateStrings": true,
-
-	"validateIndentation": "\t",
-	"validateLineBreaks": "LF",
-	"validateNewlineAfterArrayElements": true,
-	"validateParameterSeparator": ", ",
-	"validateQuoteMarks": "'",
-
-	"excludeFiles": [
-		"coverage",
-		"node_modules",
-		"public/js"
-	]
-}

.jshintrc

@@ -1,26 +0,0 @@
-{
-	"curly": true,
-	"eqeqeq": true,
-	"esversion": 6,
-	"forin": true,
-	"globals": {
-		"after": true,
-		"afterEach": true,
-		"before": true,
-		"beforeEach": true,
-		"describe": true,
-		"it": true
-	},
-	"latedef": "nofunc",
-	"maxcomplexity": 6,
-	"maxdepth": 2,
-	"maxparams": 4,
-	"noarg": true,
-	"node": true,
-	"nonew": true,
-	"nonstandard": true,
-	"shadow": false,
-	"strict": true,
-	"undef": true,
-	"unused": true
-}

.travis.yml

@@ -1,24 +0,0 @@
-
-# Language/versions
-language: node_js
-matrix:
-  include:
-    - node_js: '4'
-    - node_js: '5'
-    - node_js: '6'
-
-# Build only master (and pull-requests)
-branches:
-  only:
-    - master
-
-# Services setup
-services:
-  - mongodb
-
-# Build script
-before_script:
-  - cp config/test.sample.json config/test.json
-  - NODE_ENV=test node index.js &
-  - sleep 5 # give server time to start
-script: 'make ci'

CHANGELOG.md

@@ -1,6 +1,88 @@
-
 # Changelog
 
+## 4.2.0 (2022-03-30)
+
+* Add request logging for easier debugging
+* Dependencies update
+
+## 4.1.0 (2021-11-26)
+
+* Add support for new WCAG 2.1 rules and remove all references to Section 508.
+* Move troubleshooting guide to the README.
+
+## 4.0.0 (2021-11-26)
+
+* Update pa11y to version 6.
+* Drop support for versions of Node.js older than 12.
+* Update MongoDB Node driver from v2 to v3, which adds support for MongoDB v4 databases.
+
+## 3.3.0 (2021-04-27)
+
+* Add new list view to the dashboard (thanks @sangitamane)
+* Upgrade express-hbs to the latest version in order to address several potential vulnerabilities
+* Fixes a MongoDB "ObjectID generation failed" error.
+* Update pa11y-webservice to version 3.2.1 and pa11y to version 5.3.1
+
+## 3.2.0 (2020-10-05)
+
+* Update pa11y to version 5.3.0, which means better compatibility with sites using AMD modules
+* Update pa11y-webservice to version 3.2.0, which adds the ability to configure the number of workers running pa11y tests
+* Update several dependencies
+* Replace chalk with kleur
+
+## 3.1.0 (2019-09-27)
+
+* Display the task ID before each line of output, so it's clear to which task a line of output belongs to when they run in parallel.
+* Bump pa11y-webservice version, which fixes an issue with some pages failing to run.
+* Fix incorrect routes passing an invalid value to Mongo's ObjectID.
+
+## 3.0.0 (2019-07-16)
+
+* Update pa11y to v5, which replaces Phantomjs with Headless Chrome
+* Update dependencies
+* Several bug fixes and documentation updates
+* See the [migration guide](https://github.com/pa11y/pa11y-dashboard/blob/master/MIGRATION.md#migrating-from-20-to-30) for details of the breaking changes in this release
+
+## 2.4.2 (2018-06-21)
+
+* Update dependencies
+* body-parser: ~1.17.1 to ^1.18.3
+* compression: ~1.6 to ^1.7.2
+* express: ~4.15.2 to ^4.16.3
+* moment: ~2.15.2 to ^2.22.2
+
+## 2.4.1 (2017-11-28)
+
+* Update dependencies
+* pa11y-webservice: ^2.3.0 to ^2.3.1
+
+## 2.4.0 (2017-11-23)
+
+* Add the ability to export the results graph as a PNG, see #197 for more information
+
+## 2.3.0 (2017-10-31)
+
+* Large overhaul of the results page, see #196 for more information
+
+## 2.2.2 (2017-03-23)
+
+* Upgrades `body-parser` and `express`. Fixes a vulnerability in `qs`: https://snyk.io/vuln/npm:qs:20170213
+
+## 2.2.1 (2017-02-07)
+
+* Fix task editing when no actions are specified
+
+## 2.2.0 (2017-01-27)
+
+* Add support for Pa11y actions
+* Update dependencies
+  * pa11y-webservice: ~2.1.2 to ^2.3.0
+
+## 2.1.2 (2016-12-12)
+
+* Hide the "add" button in readonly mode
+* Add a contributing guide
+
 ## 2.1.1 (2016-11-20)
 
 * Use arrows instead of plus and minus for collapsibles/expanders

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+
+Contributing Guide
+==================
+
+Thanks for getting involved :tada:
+
+The Pa11y team loves to see new contributors, and we strive to provide a welcoming and inclusive environment. We ask that all contributors read and follow [our code of conduct][code-of-conduct] before joining. If you represent an organisation, then you might find our [guide for companies][companies] helpful.
+
+Our website outlines the many ways that you can contribute to Pa11y:
+
+  - [Help us to talk to our users][communications]
+  - [Help us out with design][designers]
+  - [Help us with our code][developers]
+
+
+
+[code-of-conduct]: http://pa11y.org/contributing/code-of-conduct/
+[communications]: http://pa11y.org/contributing/communications/
+[companies]: http://pa11y.org/contributing/companies/
+[designers]: http://pa11y.org/contributing/designers/
+[developers]: http://pa11y.org/contributing/developers/

MIGRATION.md

@@ -1,18 +1,39 @@
-
+# Migration Guide
-Migration Guide
-===============
 
 Pa11y Dashboard's API changes between major versions. This is a guide to help you make the switch when this happens.
 
+## Table of contents
 
-Table Of Contents
+* [Table of contents](#table-of-contents)
------------------
+* [Migrating from 3.0 to 4.0](#migrating-from-30-to-40)
+* [Migrating from 2.0 to 3.0](#migrating-from-20-to-30)
+	* [PhantomJS to Headless Chrome](#phantomjs-to-headless-chrome)
+	* [Node.js Support](#nodejs-support)
+	* [Miscellaneous](#miscellaneous)
+* [Migrating from 1.0 to 2.0](#migrating-from-10-to-20)
+	* [Node.js Support](#nodejs-support-1)
 
-- [Migrating from 1.0 to 2.0](#migrating-from-10-to-20)
+## Migrating from 3.0 to 4.0
 
+Pa11y Dashboard requires Node.js version 12 or greater. Versions 8 and 10 are not supported any more.
 
-Migrating from 1.0 to 2.0
+## Migrating from 2.0 to 3.0
--------------------------
+
+### PhantomJS to Headless Chrome
+
+Pa11y Dashboard 3 uses version 5 of Pa11y, which replaces PhantomJS with [Headless Chrome](https://developers.google.com/web/updates/2017/04/headless-chrome). This allows us to use more modern JavaScript APIs and make Pa11y testing more stable.
+
+As a result of this change, [Pa11y Dashboard's requirements](../README.md#requirements) have changed, and you may need to install additional dependencies required by Chrome before being able to use this version.
+
+### Node.js Support
+
+Pa11y Dashboard 3 requires Node.js version 8 or greater. Versions 4 and 6 are not supported any more.
+
+### Miscellaneous
+
+The default viewport dimensions for Pa11y have been changed from `1024x768` to `1280x1024`. This could make pa11y report a different number of errors if different content appears on the page based on its width, so results obtained with v2 and v3 may not be comparable.
+
+## Migrating from 1.0 to 2.0
 
 ### Node.js Support
 

Makefile

@@ -1,59 +1,41 @@
+include Makefile.node
 
-# Color helpers
+# We need to run integration tests recursively
-C_CYAN=\x1b[34;01m
+export INTEGRATION_FLAGS := --recursive
-C_RESET=\x1b[0m
 
-# Group targets
-all: deps lint test
-ci: lint test
 
-# Install dependencies
+# Verify tasks
-deps:
+# ------------
-	@echo "$(C_CYAN)> installing dependencies$(C_RESET)"
-	@npm install
 
-# Lint JavaScript
+# Lint alias for backwards compatibility
-lint: jshint jscs
+lint: verify
 
-# Run JSHint
-jshint:
-	@echo "$(C_CYAN)> linting javascript$(C_RESET)"
-	@./node_modules/.bin/jshint .
 
-# Run JavaScript Code Style
+# Client-side asset tasks
-jscs:
+# -----------------------
-	@echo "$(C_CYAN)> checking javascript code style$(C_RESET)"
-	@./node_modules/.bin/jscs .
-
-# Run all tests
-test: test-integration
-
-# Run integration tests
-test-integration:
-	@echo "$(C_CYAN)> running integration tests$(C_RESET)"
-	@./node_modules/.bin/mocha ./test/integration --reporter spec --recursive --timeout 5000 --slow 50
 
 # Compile LESS
 less:
-	@echo "$(C_CYAN)> compiling less$(C_RESET)"
+	@lessc -x ./public/less/main.less ./public/css/site.min.css
-	@./node_modules/.bin/lessc -x ./public/less/main.less ./public/css/site.min.css
+	@$(TASK_DONE)
 
 # Compile client-side JavaScript
 uglify:
-	@echo "$(C_CYAN)> compiling client-side JavaScript$(C_RESET)"
+	@uglifyjs \
-	@./node_modules/.bin/uglifyjs \
 		public/js/vendor/jquery/jquery.min.js \
 		public/js/vendor/bootstrap/js/alert.js \
 		public/js/vendor/bootstrap/js/dropdown.js \
 		public/js/vendor/bootstrap/js/tooltip.js \
 		public/js/vendor/bootstrap/js/transition.js \
 		public/js/vendor/bootstrap/js/collapse.js \
+		public/js/vendor/bootstrap/js/tab.js \
+		public/js/vendor/bootstrap/js/popover.js \
 		public/js/vendor/flot/jquery.flot.js \
 		public/js/vendor/flot/jquery.flot.dashes.js \
 		public/js/vendor/flot/jquery.flot.time.js \
 		public/js/vendor/flot/jquery.flot.selection.js \
 		public/js/vendor/flot/jquery.flot.resize.js \
+		public/js/vendor/helpers/html2canvas.min.js \
 		public/js/site.js \
 		-o ./public/js/site.min.js
-
+	@$(TASK_DONE)
-.PHONY: test

Makefile.node

@@ -0,0 +1,125 @@
+#
+# Node.js Makefile
+# ================
+#
+# Do not update this file manually – it's maintained separately on GitHub:
+# https://github.com/rowanmanning/makefiles/blob/master/Makefile.node
+#
+# To update to the latest version, run `make update-makefile`.
+#
+
+
+# Meta tasks
+# ----------
+
+.PHONY: test
+
+
+# Useful variables
+# ----------------
+
+NPM_BIN = ./node_modules/.bin
+export PATH := $(NPM_BIN):$(PATH)
+export EXPECTED_COVERAGE := 90
+export INTEGRATION_TIMEOUT := 10000
+export INTEGRATION_SLOW := 4000
+
+
+# Output helpers
+# --------------
+
+TASK_DONE = echo "✓ $@ done"
+
+
+# Group tasks
+# -----------
+
+all: install ci
+ci: verify test
+
+
+# Install tasks
+# -------------
+
+clean:
+	@git clean -fxd
+	@$(TASK_DONE)
+
+install: node_modules
+	@$(TASK_DONE)
+
+node_modules: package.json
+	@npm prune --production=false
+	@npm install
+	@$(TASK_DONE)
+
+
+# Verify tasks
+# ------------
+
+verify: verify-javascript verify-dust verify-spaces
+	@$(TASK_DONE)
+
+verify-javascript: verify-eslint verify-jshint verify-jscs
+	@$(TASK_DONE)
+
+verify-dust:
+	@if [ -e .dustmiterc* ]; then dustmite --path ./view && $(TASK_DONE); fi
+
+verify-eslint:
+	@if [ -e .eslintrc* ]; then eslint . && $(TASK_DONE); fi
+
+verify-jshint:
+	@if [ -e .jshintrc* ]; then jshint . && $(TASK_DONE); fi
+
+verify-jscs:
+	@if [ -e .jscsrc* ]; then jscs . && $(TASK_DONE); fi
+
+verify-spaces:
+	@if [ -e .editorconfig* ] && [ -x $(NPM_BIN)/lintspaces ]; then \
+		git ls-files | xargs lintspaces -e .editorconfig && $(TASK_DONE); \
+	fi
+
+verify-coverage:
+	@if [ -d coverage ]; then \
+		if [ -x $(NPM_BIN)/nyc ]; then \
+			nyc check-coverage --lines $(EXPECTED_COVERAGE) --functions $(EXPECTED_COVERAGE) --branches $(EXPECTED_COVERAGE) && $(TASK_DONE); \
+		else \
+			if [ -x $(NPM_BIN)/istanbul ]; then \
+				istanbul check-coverage --statement $(EXPECTED_COVERAGE) --branch $(EXPECTED_COVERAGE) --function $(EXPECTED_COVERAGE) && $(TASK_DONE); \
+			fi \
+		fi \
+	fi
+
+# Test tasks
+# ----------
+
+test: test-unit-coverage verify-coverage test-integration
+	@$(TASK_DONE)
+
+test-unit:
+	@if [ -d test/unit ]; then mocha test/unit --recursive && $(TASK_DONE); fi
+
+test-unit-coverage:
+	@if [ -d test/unit ]; then \
+		if [ -x $(NPM_BIN)/nyc ]; then \
+			nyc --reporter=text --reporter=html $(NPM_BIN)/_mocha test/unit --recursive && $(TASK_DONE); \
+		else \
+			if [ -x $(NPM_BIN)/istanbul ]; then \
+				istanbul cover $(NPM_BIN)/_mocha -- test/unit --recursive && $(TASK_DONE); \
+			else \
+				make test-unit; \
+			fi \
+		fi \
+	fi
+
+test-integration:
+	@if [ -d test/integration ]; then mocha test/integration --timeout $(INTEGRATION_TIMEOUT) --slow $(INTEGRATION_SLOW) $(INTEGRATION_FLAGS) && $(TASK_DONE); fi
+
+
+# Tooling tasks
+# -------------
+
+update-makefile:
+	@curl -s https://raw.githubusercontent.com/rowanmanning/makefiles/master/Makefile.node > Makefile.node
+	@$(TASK_DONE)

README.md

@@ -1,5 +1,4 @@
-Pa11y Dashboard
+# 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.
 
@@ -8,27 +7,77 @@ Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter;
 [![Build status][shield-build]][info-build]
 [![GPL-3.0 licensed][shield-license]][info-license]
 
----
+![dashboard](https://user-images.githubusercontent.com/6110968/61603347-0bce1000-abf2-11e9-87b2-a53f91d315bb.jpg)
-
+![results-page](https://user-images.githubusercontent.com/6110968/62183438-05851580-b30f-11e9-9bc4-b6a4823ae9e8.jpg)
-✨ 🔜 ✨ The Pa11y team is very excited to announce plans for the successor to Pa11y Dashboard and Pa11y Webservice, codename "Sidekick". Help us define the features that you want to see by visiting the [proposal][sidekick-proposal]. ✨  
 
 ---
 
+## Requirements
 
-![dashboard](https://f.cloud.github.com/assets/1225142/1549567/f0361e72-4de8-11e3-8d14-3fe6900cc15d.jpg)
+Pa11y Dashboard is a [Node.js][node] application and requires a stable or LTS version of Node, currently version 12 or 14.
-![results-page](https://f.cloud.github.com/assets/1225142/1549568/f225aa54-4de8-11e3-8b25-ef2f405997a3.jpg)
 
+⚠️ At the moment, Pa11y Dashboard won't work with Node.js v16. Please use Node.js 12 or 14. ⚠️
 
-Setup
+Pa11y Dashboard uses a [MongoDB][mongo] database to store the results of the tests. The database doesn't have to be in the same server or computer where Pa11y Dashboard is running from.
------
 
-Pa11y Dashboard requires [Node.js][node] 4+ and [PhantomJS][phantom]. See the [Pa11y][pa11y] documentation for detailed instructions on how to install these dependencies on your operating system.
+Pa11y Dashboard uses [puppeteer](https://www.npmjs.com/package/puppeteer) to create a headless instance of the Chromium browser in order to run the tests. On certain environments this may require additional dependencies to be installed. For example, in Debian/Ubuntu systems you may need to install the `libnss3` and `libgconf-2-4` libraries in order to be able to run tests on Pa11y Dashboard. Please refer to the documentation from your provider for details on how to do this.
 
-You'll also need to have [MongoDB][mongo] installed and running. See the [MongoDB install guide][mongo-install] for more information on this.
+## Setting up Pa11y Dashboard
 
-You'll then need to clone this repo locally and install dependencies with `npm install`. Now you need to add some configuration before you can run the application. We can do this in two ways:
+In order to run Pa11y Dashboard, we recommend cloning this repository locally:
 
-### Option 1: Using Environment Variables
+```sh
+git clone https://github.com/pa11y/pa11y-dashboard.git
+```
+
+Then installing the dependencies:
+
+```sh
+cd pa11y-dashboard
+npm install
+```
+
+### Installing MongoDB
+
+Instructions for installing and running MongoDB are outside the scope of this document. When in doubt, please refer to the [MongoDB installation instructions](https://docs.mongodb.com/manual/installation/) for details of how to install and run MongoDB on your specific operating system. An example of the installation and configuration process for macOS follows.
+
+Pa11y Dashboard currently uses version 3 of the Node.js MongoDB driver, which means that [only MongoDB servers of versions 4.4 or older are supported](https://docs.mongodb.com/drivers/node/current/compatibility/#mongodb-compatibility). Please ensure that your MongoDB server fills the requirements before trying to run Pa11y Dashboard.
+
+#### Example MongoDB installation for macOS
+
+On recent versions of macOS (10.13 or later), you can use [Homebrew](https://brew.sh/) to install MongoDB Community Edition. More recent versions of MongoDB are untested and unsupported.
+
+Tap the MongoDB Homebrew Tap:
+
+```sh
+brew tap mongodb/brew
+```
+
+Install a supported Community version of MongoDB:
+
+```sh
+brew install mongodb-community@4.4
+```
+
+Start the MongoDB server:
+
+```sh
+brew services start mongodb/brew/mongodb-community@4.4
+```
+
+Check that the service has started properly:
+
+```sh
+$ brew services list
+Name              Status  User       Plist
+mongodb-community started pa11y      /Users/pa11y/Library/LaunchAgents/homebrew.mxcl.mongodb-community.plist
+```
+
+### Configuring Pa11y Dashboard
+
+The last step before being able to run Pa11y Dashboard is to define a configuration for it. This can be done in two ways:
+
+#### Option 1: Using environment variables
 
 Each configuration can be set with an environment variable rather than a config file. For example to run the application on port `8080` you can use the following:
 
@@ -36,11 +85,17 @@ Each configuration can be set with an environment variable rather than a config
 PORT=8080 node index.js
 ```
 
-The [available configurations are documented here](#configurations).
+The [available configurations](#configurations) are documented in the next section.
 
-### Option 2: Using Config Files
+#### Option 2: Using config files
 
-You'll need to copy and modify different config files depending on your environment (set with `NODE_ENV`):
+You can store the configuration for Pa11y Dashboard on a JSON file. You can use a different configuration file for each environment you're planning to run Pa11y Dashboard on. You can choose a specific environment to run the application from by setting the `NODE_ENV` environment variable:
+
+```sh
+NODE_ENV=development node index.js
+```
+
+Three example files are provided in this repository, you can copy and customise them to your liking:
 
 ```sh
 cp config/development.sample.json config/development.json
@@ -48,61 +103,52 @@ cp config/production.sample.json config/production.json
 cp config/test.sample.json config/test.json
 ```
 
-Each of these files defines configurations for a different environment. If you're just running the application locally, then you should be OK with just development and test configurations. The [available configurations are documented here](#configurations).
+The [available configurations](#configurations) are documented in the next section.
 
-Now that you've got your application configured, make sure you have a MongoDB server running with the `mongod` command in another terminal window. You can run in each mode by changing the `NODE_ENV` environment variable:
+If you run into problems, check the [troubleshooting guide][#troubleshooting].
 
-```sh
+## Configurations
-NODE_ENV=development node index.js
-```
-
-See [development instructions](#development) for more information about running locally (and restarting automatically when files change).
-
-If you run into problems, check the [troubleshooting guide][troubleshooting].
-
-
-Configurations
---------------
 
 The boot configurations for Pa11y Dashboard are as follows. Look at the sample JSON files in the repo for example usage.
 
 ### port
+
 *(number)* The port to run the application on. Set via a config file or the `PORT` environment variable.
 
 ### noindex
+
 *(boolean)* If set to `true` (default), the dashboard will not be indexed by search engines. Set to `false` to allow indexing. Set via a config file or the `NOINDEX` environment variable.
 
 ### readonly
+
 *(boolean)* If set to `true`, users will not be able to add, delete or run URLs (defaults to `false`). Set via a config file or the `READONLY` environment variable.
 
 ### siteMessage
+
 *(string)* A message to display prominently on the site home page. Defaults to `null`.
 
 ### webservice
+
 This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [Pa11y Webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`.
 
+## Contributing
 
-Development
+There are many ways to contribute to Pa11y Dashboard, we cover these in the [contributing guide](CONTRIBUTING.md) for this repo.
------------
 
-To develop Pa11y Dashboard, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup).
+If you're ready to contribute some code, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup). You'll then need to start the application in test mode with:
-
-You'll need to start the application in test mode with:
 
 ```sh
 NODE_ENV=test node index.js
 ```
 
-Now you'll be able to run the following commands:
+You'll now be able to run the following commands:
 
 ```sh
-make       # Run the lint and test tasks together
+make verify              # Verify all of the code (ESLint)
-make lint  # Run linters with the correct config
+make test                # Run all tests
-make test  # Run integration tests
+make test-integration    # Run the integration tests
 ```
 
-Code with lint errors or failing tests will not be accepted, please use the build tools outlined above.
-
 To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository.
 
 ```sh
@@ -110,14 +156,23 @@ make less    # Compile the site CSS from LESS files
 make uglify  # Compile and uglify the client-side JavaScript
 ```
 
+## Useful resources
 
-Useful Resources
+* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean](https://una.im/pa11y-dash/)
--------
+* [Monitoring Web Accessibility Compliance With Pa11y Dashboard](https://www.lullabot.com/articles/monitoring-web-accessibility-compliance-with-pa11y-dashboard)
-* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean][resource-una-k]
 
+## Troubleshooting
 
-Support and Migration
+### Common issues
----------------------
+
+* `500` errors or `Could not connect to pa11y-webservice` messages are often related to MongoDB. Ensure that you have the [appropriate version of MongoDB][#installing-mongodb] installed, and that it's running - it doesn't always start automatically.
+* Error messages saying that pa11y-webservice isn't running may be due to dependency installation problems. Try deleting your `pa11y-dashboard/node_modules` directory and running `npm install` again.
+
+### Create a new issue
+
+Check the [issue tracker][issues] for similar issues before creating a new one. If the problem that you're experiencing is not covered by one of the existing issues, you can [create a new issue][create-issue]. Please include your node.js and MongoDB version numbers, and your operating system, as well as any information that may be useful in debugging the issue.
+
+## Support and Migration
 
 Pa11y Dashboard major versions are normally supported for 6 months after their last minor release. This means that patch-level changes will be added and bugs will be fixed. The table below outlines the end-of-support dates for major versions, and the last minor release for that version.
 
@@ -125,37 +180,29 @@ We also maintain a [migration guide](MIGRATION.md) to help you migrate.
 
 | :grey_question: | Major Version | Last Minor Release | Node.js Versions | Support End Date |
 | :-------------- | :------------ | :----------------- | :--------------- | :--------------- |
-| :heart:         | 2             | N/A                | 4+               | N/A              |
+| :heart:         | 4             | N/A                | 12+              | N/A              |
-| :hourglass:     | 1             | 1.12               | 0.10–6           | 2016-12-05       |
+| :hourglass:     | 3             | 3.3.0              | 8+               | 2022-05-26       |
+| :skull:         | 2             | 2.4.2              | 4+               | 2020-01-16       |
+| :skull:         | 1             | 1.12               | 0.10–6           | 2016-12-05       |
 
 If you're opening issues related to these, please mention the version that the issue relates to.
 
+## License
 
-License
+Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].<br/>
--------
+Copyright &copy; 2013–2020, Team Pa11y and contributors
-
-Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].  
-Copyright &copy; 2013–2016, Springer Nature
-
-
 
 [gpl]: http://www.gnu.org/licenses/gpl-3.0.html
 [mongo]: http://www.mongodb.org/
-[mongo-install]: https://docs.mongodb.org/manual/installation/
 [node]: http://nodejs.org/
 [pa11y]: https://github.com/pa11y/pa11y
 [pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations
-[phantom]: http://phantomjs.org/
+[issues]: https://github.com/pa11y/pa11y-dashboard/issues?utf8=%E2%9C%93&q=is%3Aissue
-[resource-una-k]: https://una.im/pa11y-dash/
+[create-issue]: https://github.com/pa11y/pa11y-dashboard/issues/new
-[sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md
-[travis]: https://travis-ci.org/pa11y/dashboard
-[travis-img]: https://travis-ci.org/pa11y/dashboard.png?branch=master
-[troubleshooting]: https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md
-
-[info-license]: LICENSE
 [info-node]: package.json
-[info-build]: https://travis-ci.org/pa11y/dashboard
+[info-build]: https://travis-ci.org/pa11y/pa11y-dashboard
+[info-license]: LICENSE
+[shield-version]: https://img.shields.io/github/package-json/v/pa11y/pa11y-dashboard.svg
+[shield-node]: https://img.shields.io/node/v/pa11y/pa11y-dashboard.svg
+[shield-build]: https://img.shields.io/travis/pa11y/pa11y-dashboard/master.svg
 [shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg
-[shield-node]: https://img.shields.io/badge/node.js%20support-4–6-brightgreen.svg
-[shield-version]: https://img.shields.io/badge/version-2.1.1-blue.svg
-[shield-build]: https://img.shields.io/travis/pa11y/dashboard/master.svg

TROUBLESHOOTING.md

@@ -1,27 +0,0 @@
-Troubleshooting
-===============
-
-
-Common issues
------
-
-* `500` errors or `Could not connect to pa11y-webservice` messages are often related to MongoDB. Ensure that you have the [latest version of MongoDB][mongo-install] installed, and that it's running - it doesn't always start automatically. 
-* Error messages saying that pa11y-webservice isn't running may be due to dependency installation problems. Try deleting your `pa11y-dashboard/node_modules` directory and running `npm install` again. 
-
-
-Check to see if the issue has been reported
------
-
-* Check the [issue tracker][issues] for similar issues.
-
-
-Create an issue
------
-
-If all else fails, [create an issue][create-issue] and we'll help you. Please include your node.js, Phantom, and MongoDB version numbers, and your operating system. 
-
-
-[issues]: https://github.com/pa11y/dashboard/issues?utf8=%E2%9C%93&q=is%3Aissue
-[mongo-install]: https://docs.mongodb.org/manual/installation/
-[create-issue]: https://github.com/pa11y/dashboard/issues/new
-

app.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const bodyParser = require('body-parser');
@@ -21,6 +20,8 @@ const createClient = require('pa11y-webservice-client-node');
 const EventEmitter = require('events').EventEmitter;
 const express = require('express');
 const hbs = require('express-hbs');
+const morgan = require('morgan');
+const {nanoid} = require('nanoid');
 const http = require('http');
 const pkg = require('./package.json');
 
@@ -36,14 +37,57 @@ function initApp(config, callback) {
 	}
 
 	const app = new EventEmitter();
+
 	app.address = null;
 	app.express = express();
 	app.server = http.createServer(app.express);
 	app.webservice = createClient(webserviceUrl);
 
+	loadMiddleware(app);
+
+	// View engine
+	loadViewEngine(app, config);
+
+	// Load routes
+	loadRoutes(app, config);
+
+	// Error handling
+	loadErrorHandling(app, config, callback);
+}
+
+// Get default configurations
+function defaultConfig(config) {
+	if (typeof config.noindex !== 'boolean') {
+		config.noindex = true;
+	}
+	if (typeof config.readonly !== 'boolean') {
+		config.readonly = false;
+	}
+	return config;
+}
+
+function loadMiddleware(app) {
 	// Compression
 	app.express.use(compression());
 
+	// Adds an ID to every request, used later for logging
+	app.express.use(addRequestId);
+
+	// Logging middleware
+	morgan.token('id', request => {
+		return request.id;
+	});
+
+	// Log the start of all HTTP requests
+	const startLog = '[:date[iso] #:id] Started :method :url for :remote-addr';
+	// Immediate: true is required to log the request
+	//  before the response happens
+	app.express.use(morgan(startLog, {immediate: true}));
+
+	// Log the end of all HTTP requests
+	const endLog = '[:date[iso] #:id] Completed :status :res[content-length] in :response-time ms';
+	app.express.use(morgan(endLog));
+
 	// Public files
 	app.express.use(express.static(`${__dirname}/public`, {
 		maxAge: (process.env.NODE_ENV === 'production' ? 604800000 : 0)
@@ -54,8 +98,9 @@ function initApp(config, callback) {
 	app.express.use(bodyParser.urlencoded({
 		extended: true
 	}));
+}
 
-	// View engine
+function loadViewEngine(app, config) {
 	app.express.engine('html', hbs.express4({
 		extname: '.html',
 		contentHelperName: 'content',
@@ -70,6 +115,7 @@ function initApp(config, callback) {
 	require('./view/helper/date')(hbs);
 	require('./view/helper/string')(hbs);
 	require('./view/helper/url')(hbs);
+	require('./view/helper/conditionals')(hbs);
 
 	// Populate view locals
 	app.express.locals = {
@@ -84,17 +130,21 @@ function initApp(config, callback) {
 		settings: {}
 	};
 
-	app.express.use((req, res, next) => {
+	app.express.use((request, response, next) => {
-		res.locals.isHomePage = (req.path === '/');
+		response.locals.isHomePage = (request.path === '/');
-		res.locals.host = req.hostname;
+		response.locals.host = request.hostname;
 		next();
 	});
+}
 
-	// Load routes
+function loadRoutes(app, config) {
+	// Because there's some overlap between the different routes,
+	//  they have to be loaded in a specific order in order to avoid
+	//  passing mongo the wrong id which would result in
+	//  "ObjectID generation failed." errors (e.g. #277)
 	require('./route/index')(app);
-	require('./route/task/index')(app);
-	require('./route/result/index')(app);
 	require('./route/result/download')(app);
+
 	if (!config.readonly) {
 		require('./route/new')(app);
 		require('./route/task/delete')(app);
@@ -104,39 +154,43 @@ function initApp(config, callback) {
 		require('./route/task/unignore')(app);
 	}
 
-	// Error handling
+	// Needs to be loaded after `/route/new`
-	app.express.get('*', (req, res) => {
+	require('./route/task/index')(app);
-		res.status(404);
+	// Needs to be loaded after `/route/task/edit`
-		res.render('404');
+	require('./route/result/index')(app);
+}
+
+function loadErrorHandling(app, config, callback) {
+	app.express.get('*', (request, response) => {
+		response.status(404);
+		response.render('404');
 	});
-	app.express.use((err, req, res, next) => {
+	app.express.use((error, request, response, next) => {
-		/* jshint unused: false */
+		/* eslint no-unused-vars: 'off' */
-		if (err.code === 'ECONNREFUSED') {
+		if (error.code === 'ECONNREFUSED') {
-			err = new Error('Could not connect to Pa11y Webservice');
+			error = new Error('Could not connect to Pa11y Webservice');
 		}
-		app.emit('route-error', err);
+		app.emit('route-error', error);
 		if (process.env.NODE_ENV !== 'production') {
-			res.locals.error = err;
+			response.locals.error = error;
 		}
-		res.status(500);
+		response.status(500);
-		res.render('500');
+		response.render('500');
 	});
 
-	app.server.listen(config.port, err => {
+	app.server.listen(config.port, error => {
 		const address = app.server.address();
 		app.address = `http://${address.address}:${address.port}`;
-		callback(err, app);
+		callback(error, app);
 	});
-
 }
 
-// Get default configurations
+// Express middleware
-function defaultConfig(config) {
+function addRequestId(request, response, next) {
-	if (typeof config.noindex !== 'boolean') {
+	// Create a random request (nano)id, 10 characters long
-		config.noindex = true;
+	// Nano ids are [0-9A-Za-z_-] so chance of collision is 1 in 64^10
-	}
+	// If a site has so much traffic that this chance is too high
-	if (typeof config.readonly !== 'boolean') {
+	//  we probably have worse things to worry about
-		config.readonly = false;
+	request.id = nanoid(10);
-	}
+	next();
-	return config;
 }

config.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const fs = require('fs');

data/.eslintrc.js

@@ -0,0 +1,8 @@
+'use strict';
+
+// Clone the main config
+const config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc')));
+
+// Disable max line length/statements
+config.rules['max-len'] = 'off';
+config.rules['max-statements'] = 'off';

data/standards.js

@@ -20,211 +20,6 @@ module.exports = getStandards;
 
 function getStandards() {
 	return [
-		{
-			title: 'Section508',
-			rules: [
-				{
-					name: 'Section508.A.Audio',
-					description: 'For multimedia containing audio only, ensure an alternative is available, such as a full text transcript.'
-				},
-				{
-					name: 'Section508.A.Img.EmptyAltInLink',
-					description: 'Img element is the only content of the link, but is missing alt text. The alt text should describe the purpose of the link.'
-				},
-				{
-					name: 'Section508.A.Img.NullAltWithTitle',
-					description: 'Img element with empty alt text must have absent or empty title attribute.'
-				},
-				{
-					name: 'Section508.A.Img.Ignored',
-					description: 'Img element is marked so that it is ignored by Assistive Technology.'
-				},
-				{
-					name: 'Section508.A.Img.MissingAlt',
-					description: 'Img element missing an alt attribute. Use the alt attribute to specify a short text alternative.'
-				},
-				{
-					name: 'Section508.A.Img.GeneralAlt',
-					description: 'Ensure that the img element\'s alt text serves the same purpose and presents the same information as the image.'
-				},
-				{
-					name: 'Section508.A.InputImage.MissingAlt',
-					description: 'Image submit button missing an alt attribute. Specify a text alternative that describes the button\'s function, using the alt attribute.'
-				},
-				{
-					name: 'Section508.A.InputImage.GeneralAlt',
-					description: 'Ensure that the image submit button\'s alt text identifies the purpose of the button.'
-				},
-				{
-					name: 'Section508.A.Area.MissingAlt',
-					description: 'Area element in an image map missing an alt attribute. Each area element must have a text alternative that describes the function of the image map area.'
-				},
-				{
-					name: 'Section508.A.Area.GeneralAlt',
-					description: 'Ensure that the area element\'s text alternative serves the same purpose as the part of image map image it references.'
-				},
-				{
-					name: 'Section508.A.Object.MissingBody',
-					description: 'Object elements must contain a text alternative after all other alternatives are exhausted.'
-				},
-				{
-					name: 'Section508.A.Object.GeneralAlt',
-					description: 'Check that short (and if appropriate, long) text alternatives are available for non-text content that serve the same purpose and present the same information.'
-				},
-				{
-					name: 'Section508.A.Applet.MissingBody',
-					description: 'Applet elements must contain a text alternative in the element\'s body, for browsers without support for the applet element.'
-				},
-				{
-					name: 'Section508.A.Applet.MissingAlt',
-					description: 'Applet elements must contain an alt attribute, to provide a text alternative to browsers supporting the element but are unable to load the applet.'
-				},
-				{
-					name: 'Section508.A.Applet.GeneralAlt',
-					description: 'Check that short (and if appropriate, long) text alternatives are available for non-text content that serve the same purpose and present the same information.'
-				},
-				{
-					name: 'Section508.B.Video',
-					description: 'For multimedia containing video, ensure a synchronised audio description or text alternative for the video portion is provided.'
-				},
-				{
-					name: 'Section508.B.Captions',
-					description: 'For multimedia containing synchronised audio and video, ensure synchronised captions are provided for the audio portion.'
-				},
-				{
-					name: 'Section508.C.Colour',
-					description: 'Ensure that any information conveyed using colour alone is also available without colour, such as through context or markup.'
-				},
-				{
-					name: 'Section508.D.Linearised',
-					description: 'Ensure that content is ordered in a meaningful sequence when linearised, such as when style sheets are disabled.'
-				},
-				{
-					name: 'Section508.D.HiddenText',
-					description: 'If content is hidden and made visible using scripting (such as "click to expand" sections), ensure this content is readable when scripts and style sheets are disabled.'
-				},
-				{
-					name: 'Section508.D.[msgCode]',
-					description: 'Semantic markup should be used to mark emphasised or special text so that it can be programmatically determined.'
-				},
-				{
-					name: 'Section508.D.HeadingOrder',
-					description: 'The heading structure is not logically nested. This [Node name, eg. h2] element appears to be the primary document heading, so should be an h1 element.'
-				},
-				{
-					name: 'Section508.D.HeadingOrder',
-					description: 'The heading structure is not logically nested. This [Node name, eg. h4] element should be an [Expected heading node name, eg. h2] to be properly nested.'
-				},
-				{
-					name: 'Section508.G.TableHeaders',
-					description: 'This table has no headers. If this is a data table, ensure row and column headers are identified using th elements.'
-				},
-				{
-					name: 'Section508.H.IncorrectHeadersAttr',
-					description: 'Incorrect headers attribute on this td element. Expected "[Expected list of IDs]" but found "[Actual list of IDs]".'
-				},
-				{
-					name: 'Section508.H.MissingHeadersAttrs',
-					description: 'The relationship between td elements and their associated th elements is not defined. As this table has multiple levels of th elements, you must use the headers attribute on td elements.'
-				},
-				{
-					name: 'Section508.H.MissingHeaderIds',
-					description: 'Not all th elements in this table contain an id attribute. These cells should contain ids so that they may be referenced by td elements headers attributes.\''
-				},
-				{
-					name: 'Section508.H.IncompleteHeadersAttrs',
-					description: 'Not all td elements in this table contain a headers attribute. Each headers attribute should list the ids of all th elements associated with that cell.'
-				},
-				{
-					name: 'Section508.I.Frames',
-					description: 'This [Node Name] element is missing title text. Frames should be titled with text that facilitates frame identification and navigation.'
-				},
-				{
-					name: 'Section508.J.Flicker',
-					description: 'Check that no component of the content flickers at a rate of greater than 2 and less than 55 times per second.'
-				},
-				{
-					name: 'Section508.K.AltVersion',
-					description: 'If this page cannot be made compliant, a text-only page with equivalent information or functionality should be provided. The alternative page needs to be updated in line with this page\'s content.'
-				},
-				{
-					name: 'Section508.L.EmptyAnchorNoId',
-					description: 'Anchor element found with no link content and no name and/or ID attribute.'
-				},
-				{
-					name: 'Section508.L.PlaceholderAnchor',
-					description: 'Anchor element found with link content, but no href, ID or name attribute has been supplied.'
-				},
-				{
-					name: 'Section508.L.NoContentAnchor',
-					description: 'Anchor element found with a valid href attribute, but no link content has been supplied.'
-				},
-				{
-					name: 'Section508.L.DblClick',
-					description: 'Ensure the functionality provided by double-clicking on this element is available through the keyboard.'
-				},
-				{
-					name: 'Section508.L.MouseOver',
-					description: 'Ensure the functionality provided by mousing over this element is available through the keyboard; for instance, using the focus event.'
-				},
-				{
-					name: 'Section508.L.MouseOut',
-					description: 'Ensure the functionality provided by mousing out of this element is available through the keyboard; for instance, using the blur event.'
-				},
-				{
-					name: 'Section508.L.MouseMove',
-					description: 'Ensure the functionality provided by moving the mouse on this element is available through the keyboard.'
-				},
-				{
-					name: 'Section508.L.MouseDown',
-					description: 'Ensure the functionality provided by mousing down on this element is available through the keyboard; for instance, using the keydown event.'
-				},
-				{
-					name: 'Section508.L.MouseUp',
-					description: 'Ensure the functionality provided by mousing up on this element is available through the keyboard; for instance, using the keyup event.'
-				},
-				{
-					name: 'Section508.M.PluginLink',
-					description: 'If external media requires a plugin or application to view, ensure a link is provided to a plugin or application that complies with Section 508 accessibility requirements for applications.'
-				},
-				{
-					name: 'Section508.N.Errors',
-					description: 'If an input error is automatically detected in this form, check that the item(s) in error are identified and the error(s) are described to the user in text.'
-				},
-				{
-					name: 'Section508.N.Labels',
-					description: 'Check that descriptive labels or instructions (including for required fields) are provided for user input in this form.'
-				},
-				{
-					name: 'Section508.N.KeyboardNav',
-					description: 'Ensure that this form can be navigated using the keyboard and other accessibility tools.'
-				},
-				{
-					name: 'Section508.O.SkipLinks',
-					description: 'Ensure that any common navigation elements can be bypassed; for instance, by use of skip links, header elements, or ARIA landmark roles.'
-				},
-				{
-					name: 'Section508.O.NoSuchID',
-					description: 'This link points to a named anchor [ID] within the document, but no anchor exists with that name.'
-				},
-				{
-					name: 'Section508.O.NoSuchIDFragment',
-					description: 'This link points to a named anchor [ID] within the document, but no anchor exists with that name in the fragment tested.'
-				},
-				{
-					name: 'Section508.P.TimeLimit',
-					description: 'If a timed response is required on this page, alert the user and provide sufficient time to allow them to indicate that more time is required.'
-				},
-				{
-					name: 'Section508.P.MetaRedirect',
-					description: 'Meta refresh tag used to redirect to another page, with a time limit that is not zero. Users cannot control this time limit.'
-				},
-				{
-					name: 'Section508.P.MetaRefresh',
-					description: 'Meta refresh tag used to refresh the current page. Users cannot control the time limit for this refresh.'
-				}
-			]
-		},
 		{
 			title: 'WCAG2A',
 			rules: [
@@ -516,6 +311,10 @@ function getStandards() {
 					name: 'WCAG2A.Principle2.Guideline2_1.2_1_2.F10',
 					description: 'Check that this applet or plugin provides the ability to move the focus away from itself when using the keyboard.'
 				},
+				{
+					name: 'WCAG2A.1.Principle1.Guideline2_1.2_1_4.Check',
+					description: 'Check that if a keyboard shortcut is implemented in content using only letter (including upper- and lower-case letters), punctuation, number, or symbol characters, then at least one of the following is true: \nTurn off: A mechanism is available to turn the shortcut off;\nRemap: A mechanism is available to remap the shortcut to use one or more non- printable keyboard characters(e.g.Ctrl, Alt, etc);\nActive only on focus: The keyboard shortcut for a user interface component is only active when that component has focus.'
+				},
 				{
 					name: 'WCAG2A.Principle2.Guideline2_2.2_2_1.F40.2',
 					description: 'Meta refresh tag used to redirect to another page, with a time limit that is not zero. Users cannot control this time limit.'
@@ -536,6 +335,10 @@ function getStandards() {
 					name: 'WCAG2A.Principle2.Guideline2_2.2_2_2.F47',
 					description: 'Blink elements cannot satisfy the requirement that blinking information can be stopped within five seconds.'
 				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_2.2_2_6.Check',
+					description: 'Check that users are warned of the duration of any user inactivity that could cause data loss, unless the data is preserved for more than 20 hours when the user does not take any actions.'
+				},
 				{
 					name: 'WCAG2A.Principle2.Guideline2_3.2_3_1.G19,G176',
 					description: 'Check that no component of the content flashes more than three times in any 1-second period, or that the size of any flashing area is sufficiently small.'
@@ -584,6 +387,38 @@ function getStandards() {
 					name: 'WCAG2A.Principle2.Guideline2_4.2_4_4.H77,H78,H79,H80,H81',
 					description: 'Check that the link text combined with programmatically determined link context identifies the purpose of the link.'
 				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_1.Check',
+					description: 'Check that all functionality that uses multipoint or path-based gestures for operation can be operated with a single pointer without a path-based gesture, unless a multipoint or path-based gesture is essential.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_2.SinglePointer_Check',
+					description: 'Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_2.Mousedown_Check',
+					description: 'This element has an mousedown event listener. Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_2.Touchstart_Check',
+					description: 'This element has a touchstart event listener. Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_3_F96.Check',
+					description: 'Check that for user interface components with labels that include text or images of text, the name contains the text that is presented visually.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_3_F96.AccessibleName',
+					description: 'Accessible name for this element does not contain the visible label text. Check that for user interface components with labels that include text or images of text, the name contains the text that is presented visually.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_4.Check',
+					description: 'Check that functionality that can be operated by device motion or user motion can also be operated by user interface components and responding to the motion can be disabled to prevent accidental actuation, except when: \nSupported Interface: The motion is used to operate functionality through an accessibility supported interface; \nEssential: The motion is essential for the function and doing so would invalidate the activity.'
+				},
+				{
+					name: 'WCAG2A.Principle1.Guideline2_5.2_5_4.Devicemotion',
+					description: 'This element has a devicemotion event listener. Check that functionality that can be operated by device motion or user motion can also be operated by user interface components and responding to the motion can be disabled to prevent accidental actuation, except when: \nSupported Interface: The motion is used to operate functionality through an accessibility supported interface; \nEssential: The motion is essential for the function and doing so would invalidate the activity.'
+				},
 				{
 					name: 'WCAG2A.Principle3.Guideline3_1.3_1_1.H57.2',
 					description: 'The html element should have a lang or xml:lang attribute which describes the language of the document.'
@@ -901,6 +736,54 @@ function getStandards() {
 					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_3.G96',
 					description: 'Where instructions are provided for understanding the content, do not rely on sensory characteristics alone (such as shape, size or location) to describe objects.'
 				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_4.RestrictView',
+					description: 'Check that content does not restrict its view and operation to a single display orientation, such as portrait or landscape, unless a specific display orientation is essential.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.FaultyValue',
+					description: 'This element contains a potentially faulty value in its autocomplete attribute.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Text',
+					description: 'Invalid autocomplete value. Element does not belong to Text control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Multiline',
+					description: 'Invalid autocomplete value. Element does not belong to Multiline control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Password',
+					description: 'Invalid autocomplete value. Element does not belong to Password control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Url',
+					description: 'Invalid autocomplete value. Element does not belong to Url control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Telephone',
+					description: 'Invalid autocomplete value. Element does not belong to Telephone control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Numeric',
+					description: 'Invalid autocomplete value. Element does not belong to Numeric control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Month',
+					description: 'Invalid autocomplete value. Element does not belong to Month control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Date',
+					description: 'Invalid autocomplete value. Element does not belong to Date control group.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.Purpose',
+					description: 'Check that the input field serves a purpose identified in the Input Purposes for User Interface Components section; and that the content is implemented using technologies with support for identifying the expected meaning for form input data.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_3.1_3_5_H98.MissingAutocomplete',
+					description: 'This element does not have an autocomplete attribute. If this field collects information about the user, consider adding one to comply with this Success Criterion.'
+				},
 				{
 					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_1.G14,G182',
 					description: 'Check that any information conveyed using colour alone is also available in text, or through other visual cues.'
@@ -910,7 +793,7 @@ function getStandards() {
 					description: 'If any audio plays automatically for longer than 3 seconds, check that there is the ability to pause, stop or mute the audio.'
 				},
 				{
-					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G18',
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail',
 					description: 'This element has insufficient contrast at this conformance level. Expected a contrast ratio of at least 4.5:1, but text in this element has a contrast ratio of /{value/}. Recommendation: /{colour recommendations/}.'
 				},
 				{
@@ -922,7 +805,7 @@ function getStandards() {
 					description: 'This element\'s text is placed on a background image. Ensure the contrast ratio between the text and all covered parts of the image are at least 4.5:1.'
 				},
 				{
-					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G145',
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G1451',
 					description: 'This element\'s text is placed on a background image. Ensure the contrast ratio between the text and all covered parts of the image are at least 3:1.'
 				},
 				{
@@ -941,6 +824,30 @@ function getStandards() {
 					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_5.G140,C22,C30.AALevel',
 					description: 'If the technologies being used can achieve the visual presentation, check that text is used to convey information rather than images of text, except when the image of text is essential to the information being conveyed, or can be visually customised to the user\'s requirements.'
 				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Check',
+					description: 'Check that content can be presented without loss of information or functionality, and without requiring scrolling in two dimensions for: \nVertical scrolling content at a width equivalent to 320 CSS pixels;\\n Horizontal scrolling content at a height equivalent to 256 CSS pixels; \nExcept for parts of the content which require two-dimensional layout for usage or meaning.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Fixed',
+					description: 'Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Scrolling'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Zoom',
+					description: 'Interfering with a user agents ability to zoom may be a failure of this Success Criterion.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_11_G195,G207,G18,G145,G174,F78.Check',
+					description: 'Check that the visual presentation of the following have a contrast ratio of at least 3:1 against adjacent color(s): \nUser Interface Components: Visual information required to identify user interface components and states, except for inactive components or where the appearance of the component is determined by the user agent and not modified by the author; \nGraphical Objects: Parts of graphics required to understand the content, except when a particular presentation of graphics is essential to the information being conveyed.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_12_C36,C35.Check',
+					description: 'Check that no loss of content or functionality occurs by setting all of the following and by changing no other style property: \nLine height(line spacing) to at least 1.5 times the font size; \nSpacing following paragraphs to at least 2 times the font size; \nLetter spacing(tracking) to at least 0.12 times the font size; \nWord spacing to at least 0.16 times the font size'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline1_4.1_4_13_F95.Check',
+					description: 'Check that where receiving and then removing pointer hover or keyboard focus triggers additional content to become visible and then hidden, the following are true: \nDismissable: A mechanism is available to dismiss the additional content without moving pointer hover or keyboard focus, unless the additional content communicates an input error or does not obscure or replace other content; \nHoverable: If pointer hover can trigger the additional content, then the pointer can be moved over the additional content without the additional content disappearing; \nPersistent: The additional content remains visible until the hover or focus trigger is removed, the user dismisses it, or its information is no longer valid.'
+				},
 				{
 					name: 'WCAG2AA.Principle2.Guideline2_1.2_1_1.SCR20.DblClick',
 					description: 'Ensure the functionality provided by double-clicking on this element is available through the keyboard.'
@@ -969,6 +876,10 @@ function getStandards() {
 					name: 'WCAG2AA.Principle2.Guideline2_1.2_1_2.F10',
 					description: 'Check that this applet or plugin provides the ability to move the focus away from itself when using the keyboard.'
 				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_1.2_1_4.Check',
+					description: 'Check that if a keyboard shortcut is implemented in content using only letter (including upper- and lower-case letters), punctuation, number, or symbol characters, then at least one of the following is true: \nTurn off: A mechanism is available to turn the shortcut off; \nRemap: A mechanism is available to remap the shortcut to use one or more non- printable keyboard characters(e.g.Ctrl, Alt, etc); \nActive only on focus: The keyboard shortcut for a user interface component is only active when that component has focus.'
+				},
 				{
 					name: 'WCAG2AA.Principle2.Guideline2_2.2_2_1.F40.2',
 					description: 'Meta refresh tag used to redirect to another page, with a time limit that is not zero. Users cannot control this time limit.'
@@ -989,6 +900,10 @@ function getStandards() {
 					name: 'WCAG2AA.Principle2.Guideline2_2.2_2_2.F47',
 					description: 'Blink elements cannot satisfy the requirement that blinking information can be stopped within five seconds.'
 				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_2.2_2_6.Check',
+					description: 'Check that users are warned of the duration of any user inactivity that could cause data loss, unless the data is preserved for more than 20 hours when the user does not take any actions.'
+				},
 				{
 					name: 'WCAG2AA.Principle2.Guideline2_3.2_3_1.G19,G176',
 					description: 'Check that no component of the content flashes more than three times in any 1-second period, or that the size of any flashing area is sufficiently small.'
@@ -1049,6 +964,38 @@ function getStandards() {
 					name: 'WCAG2AA.Principle2.Guideline2_4.2_4_7.G149,G165,G195,C15,SCR31',
 					description: 'Check that there is at least one mode of operation where the keyboard focus indicator can be visually located on user interface controls.'
 				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_1.Check',
+					description: 'Check that all functionality that uses multipoint or path-based gestures for operation can be operated with a single pointer without a path-based gesture, unless a multipoint or path-based gesture is essential.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_2.SinglePointer_Check',
+					description: 'Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_2.Mousedown_Check',
+					description: 'This element has an mousedown event listener. Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_2.Touchstart_Check',
+					description: 'This element has a touchstart event listener. Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_3_F96.Check',
+					description: 'Check that for user interface components with labels that include text or images of text, the name contains the text that is presented visually.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_3_F96.AccessibleName',
+					description: 'Accessible name for this element does not contain the visible label text. Check that for user interface components with labels that include text or images of text, the name contains the text that is presented visually.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_4.Check',
+					description: 'Check that functionality that can be operated by device motion or user motion can also be operated by user interface components and responding to the motion can be disabled to prevent accidental actuation, except when: \nSupported Interface: The motion is used to operate functionality through an accessibility supported interface; \nEssential: The motion is essential for the function and doing so would invalidate the activity.'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline2_5.2_5_4.Devicemotion',
+					description: 'WCAG2AA.This element has a devicemotion event listener. Check that functionality that can be operated by device motion or user motion can also be operated by user interface components and responding to the motion can be disabled to prevent accidental actuation, except when: \nSupported Interface: The motion is used to operate functionality through an accessibility supported interface; \nEssential: The motion is essential for the function and doing so would invalidate the activity.'
+				},
 				{
 					name: 'WCAG2AA.Principle3.Guideline3_1.3_1_1.H57.2',
 					description: 'The html element should have a lang or xml:lang attribute which describes the language of the document.'
@@ -1140,6 +1087,10 @@ function getStandards() {
 				{
 					name: 'WCAG2AA.Principle4.Guideline4_1.4_1_2.H91.[NodeName].Value',
 					description: 'This [element type] does not have a value available to an accessibility API. Add one [using a element-specific method].'
+				},
+				{
+					name: 'WCAG2AA.Principle1.Guideline4_1.4_1_3_ARIA22,G199,ARIA19,G83,G84,G85,G139,G177,G194,ARIA23.Check',
+					description: 'Check that status messages can be programmatically determined through role or properties such that they can be presented to the user by assistive technologies without receiving focus.'
 				}
 			]
 		},
@@ -1410,6 +1361,58 @@ function getStandards() {
 					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_3.G96',
 					description: 'Where instructions are provided for understanding the content, do not rely on sensory characteristics alone (such as shape, size or location) to describe objects.'
 				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_4.RestrictView',
+					description: 'Check that content does not restrict its view and operation to a single display orientation, such as portrait or landscape, unless a specific display orientation is essential.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.FaultyValue',
+					description: 'This element contains a potentially faulty value in its autocomplete attribute.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Text',
+					description: 'Invalid autocomplete value. Element does not belong to Text control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Multiline',
+					description: 'Invalid autocomplete value. Element does not belong to Multiline control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Password',
+					description: 'Invalid autocomplete value. Element does not belong to Password control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Url',
+					description: 'Invalid autocomplete value. Element does not belong to Url control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Telephone',
+					description: 'Invalid autocomplete value. Element does not belong to Telephone control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Numeric',
+					description: 'Invalid autocomplete value. Element does not belong to Numeric control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Month',
+					description: 'Invalid autocomplete value. Element does not belong to Month control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.InvalidAutocomplete_Date',
+					description: 'Invalid autocomplete value. Element does not belong to Date control group.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.Purpose',
+					description: 'Check that the input field serves a purpose identified in the Input Purposes for User Interface Components section; and that the content is implemented using technologies with support for identifying the expected meaning for form input data.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_5_H98.MissingAutocomplete',
+					description: 'This element does not have an autocomplete attribute. If this field collects information about the user, consider adding one to comply with this Success Criterion.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_3.1_3_6_ARIA11.Check',
+					description: 'Check that the purpose of User Interface Components, icons, and regions can be programmatically determined.'
+				},
 				{
 					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_1.G14,G182',
 					description: 'Check that any information conveyed using colour alone is also available in text, or through other visual cues.'
@@ -1427,11 +1430,11 @@ function getStandards() {
 					description: 'This element has insufficient contrast at this conformance level. Expected a contrast ratio of at least 4.5:1, but text in this element has a contrast ratio of /{value/}. Recommendation: /{colour recommendations/}.'
 				},
 				{
-					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_6.G17',
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_6.G17-1',
 					description: 'This element\'s text is placed on a background image. Ensure the contrast ratio between the text and all covered parts of the image are at least 7:1.'
 				},
 				{
-					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_6.G18',
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_6.G18-1',
 					description: 'This element\'s text is placed on a background image. Ensure the contrast ratio between the text and all covered parts of the image are at least 4.5:1.'
 				},
 				{
@@ -1462,6 +1465,34 @@ function getStandards() {
 					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_9.G140,C22,C30.NoException',
 					description: 'Check that images of text are only used for pure decoration or where a particular presentation of text is essential to the information being conveyed.'
 				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Check',
+					description: 'Check that content can be presented without loss of information or functionality, and without requiring scrolling in two dimensions for: \nVertical scrolling content at a width equivalent to 320 CSS pixels;\\n Horizontal scrolling content at a height equivalent to 256 CSS pixels; \nExcept for parts of the content which require two-dimensional layout for usage or meaning.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Fixed',
+					description: 'Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Scrolling'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_10_C32,C31,C33,C38,SCR34,G206.Zoom',
+					description: 'Interfering with a user agents ability to zoom may be a failure of this Success Criterion.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_11_G195,G207,G18,G145,G174,F78.Check',
+					description: 'Check that the visual presentation of the following have a contrast ratio of at least 3:1 against adjacent color(s): \nUser Interface Components: Visual information required to identify user interface components and states, except for inactive components or where the appearance of the component is determined by the user agent and not modified by the author; \nGraphical Objects: Parts of graphics required to understand the content, except when a particular presentation of graphics is essential to the information being conveyed.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_12_C36,C35.Check',
+					description: 'Check that no loss of content or functionality occurs by setting all of the following and by changing no other style property: \nLine height(line spacing) to at least 1.5 times the font size; \nSpacing following paragraphs to at least 2 times the font size; \nLetter spacing(tracking) to at least 0.12 times the font size; \nWord spacing to at least 0.16 times the font size'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline1_4.1_4_13_F95.Check',
+					description: 'Check that where receiving and then removing pointer hover or keyboard focus triggers additional content to become visible and then hidden, the following are true: \nDismissable: A mechanism is available to dismiss the additional content without moving pointer hover or keyboard focus, unless the additional content communicates an input error or does not obscure or replace other content; \nHoverable: If pointer hover can trigger the additional content, then the pointer can be moved over the additional content without the additional content disappearing; \nPersistent: The additional content remains visible until the hover or focus trigger is removed, the user dismisses it, or its information is no longer valid.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_1.2_1_4.Check',
+					description: 'Check that if a keyboard shortcut is implemented in content using only letter (including upper- and lower-case letters), punctuation, number, or symbol characters, then at least one of the following is true: \nTurn off: A mechanism is available to turn the shortcut off; \nRemap: A mechanism is available to remap the shortcut to use one or more non- printable keyboard characters(e.g.Ctrl, Alt, etc); \nActive only on focus: The keyboard shortcut for a user interface component is only active when that component has focus.'
+				},
 				{
 					name: 'WCAG2AAA.Principle2.Guideline2_1.2_1_1.SCR20.DblClick',
 					description: 'Ensure the functionality provided by double-clicking on this element is available through the keyboard.'
@@ -1522,10 +1553,58 @@ function getStandards() {
 					name: 'WCAG2AAA.Principle2.Guideline2_2.2_2_5.G105,G181',
 					description: 'If this Web page is part of a set of Web pages with an inactivity time limit, check that an authenticated user can continue the activity without loss of data after re-authenticating.'
 				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_2.2_2_6.Check',
+					description: 'Check that users are warned of the duration of any user inactivity that could cause data loss, unless the data is preserved for more than 20 hours when the user does not take any actions.'
+				},
 				{
 					name: 'WCAG2AAA.Principle2.Guideline2_3.2_3_2.G19',
 					description: 'Check that no component of the content flashes more than three times in any 1-second period.'
 				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_3.2_3_3.Check',
+					description: 'Check that motion animation triggered by interaction can be disabled, unless the animation is essential to the functionality or the information being conveyed.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_1.Check',
+					description: 'Check that all functionality that uses multipoint or path-based gestures for operation can be operated with a single pointer without a path-based gesture, unless a multipoint or path-based gesture is essential.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_2.SinglePointer_Check',
+					description: 'Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_2.Mousedown_Check',
+					description: 'This element has an mousedown event listener. Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_2.Touchstart_Check',
+					description: 'This element has a touchstart event listener. Check that for functionality that can be operated using a single pointer, at least one of the following is true: \nNo Down- Event: The down - event of the pointer is not used to execute any part of the function; \nAbort or Undo: Completion of the function is on the up - event, and a mechanism is available to abort the function before completion or to undo the function after completion; \nUp Reversal: The up - event reverses any outcome of the preceding down - event; \nEssential: Completing the function on the down - event is essential.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_3_F96.Check',
+					description: 'Check that for user interface components with labels that include text or images of text, the name contains the text that is presented visually.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_3_F96.AccessibleName',
+					description: 'Accessible name for this element does not contain the visible label text. Check that for user interface components with labels that include text or images of text, the name contains the text that is presented visually.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_4.Check',
+					description: 'Check that functionality that can be operated by device motion or user motion can also be operated by user interface components and responding to the motion can be disabled to prevent accidental actuation, except when: \nSupported Interface: The motion is used to operate functionality through an accessibility supported interface; \nEssential: The motion is essential for the function and doing so would invalidate the activity.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_4.Devicemotion',
+					description: 'WCAG2AA.This element has a devicemotion event listener. Check that functionality that can be operated by device motion or user motion can also be operated by user interface components and responding to the motion can be disabled to prevent accidental actuation, except when: \nSupported Interface: The motion is used to operate functionality through an accessibility supported interface; \nEssential: The motion is essential for the function and doing so would invalidate the activity.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_5.Check',
+					description: 'Check that the size of the target for pointer inputs is at least 44 by 44 CSS pixels except when:\nEquivalent: The target is available through an equivalent link or control on the same page that is at least 44 by 44 CSS pixels;\nInline: The target is in a sentence or block of text;\nUser Agent Control: The size of the target is determined by the user agent and is not modified by the author;\nEssential: A particular presentation of the target is essential to the information being conveyed.'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline2_5.2_5_6.Check',
+					description: 'Check that the content does not restrict use of input modalities available on a platform except where the restriction is essential, required to ensure the security of the content, or required to respect user settings.'
+				},
 				{
 					name: 'WCAG2AAA.Principle2.Guideline2_4.2_4_1.H64.1',
 					description: 'Iframe element requires a non-empty title attribute that identifies the frame.'
@@ -1713,6 +1792,10 @@ function getStandards() {
 				{
 					name: 'WCAG2AAA.Principle4.Guideline4_1.4_1_2.H91.[NodeName].Value',
 					description: 'This [element type] does not have a value available to an accessibility API. Add one [using a element-specific method].'
+				},
+				{
+					name: 'WCAG2AAA.Principle1.Guideline4_1.4_1_3_ARIA22,G199,ARIA19,G83,G84,G85,G139,G177,G194,ARIA23.Check',
+					description: 'Check that status messages can be programmatically determined through role or properties such that they can be presented to the user by assistive technologies without receiving focus.'
 				}
 			]
 		}

data/techniques.js

@@ -0,0 +1,716 @@
+// This file is part of Pa11y Dashboard.
+//
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Pa11y Dashboard is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+// jscs:disable maximumLineLength
+'use strict';
+
+module.exports = getTechniques;
+
+function getTechniques() {
+	return {
+		H30: {
+			title: 'H30: Providing link text that describes the purpose of a link for anchor elements',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H30'
+		},
+		H37: {
+			title: 'H37: Using alt attributes on img elements',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H37'
+		},
+		H67: {
+			title: 'H67: Using null alt text and no title attribute on img elements for images that AT should ignore',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H67'
+		},
+		G94: {
+			title: 'G94: Providing short text alternative for non-text content that serves the same purpose and presents the same information as the non-text content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G94'
+		},
+		H36: {
+			title: 'H36: Using alt attributes on images used as submit buttons',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H36'
+		},
+		H24: {
+			title: 'H24: Providing text alternatives for the area elements of image maps ',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H24'
+		},
+		G73: {
+			title: 'G73: Providing a long description in another location with a link to it that is immediately adjacent to the non-text content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G73'
+		},
+		G74: {
+			title: 'G74: Providing a long description in text near the non-text content, with a reference to the location of the long description in the short description',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G74'
+		},
+		H2: {
+			title: 'H2: Combining adjacent image and text links for the same resource',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H2'
+		},
+		H53: {
+			title: 'H53: Using the body of the object element',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H53'
+		},
+		G92: {
+			title: 'G92: Providing long description for non-text content that serves the same purpose and presents the same information',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G92'
+		},
+		H35: {
+			title: 'H35: Providing text alternatives on applet elements ',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H35'
+		},
+		G158: {
+			title: 'G158: Providing an alternative for time-based media for audio-only content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G158'
+		},
+		G159: {
+			title: 'G159: Providing an alternative for time-based media for video-only content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G159'
+		},
+		G166: {
+			title: 'G166: Providing audio that describes the important video content and describing it as such',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G166'
+		},
+		G87: {
+			title: 'G87: Providing closed captions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G87'
+		},
+		G93: {
+			title: 'G93: Providing open (always visible) captions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G93'
+		},
+		G69: {
+			title: 'G69: Providing an alternative for time based media',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G69'
+		},
+		G78: {
+			title: 'G78: Providing a second, user-selectable, audio track that includes audio descriptions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G78'
+		},
+		G173: {
+			title: 'G173: Providing a version of a movie with audio descriptions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G173'
+		},
+		G8: {
+			title: 'G8: Providing a movie with extended audio descriptions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G8'
+		},
+		G9: {
+			title: 'G9: Creating captions for live synchronized media',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G9'
+		},
+		G54: {
+			title: 'G54: Including a sign language interpreter in the video stream',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G54'
+		},
+		G81: {
+			title: 'G81: Providing a synchronized video of the sign language interpreter that can be displayed in a different viewport or overlaid on the image by the player',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G81'
+		},
+		G150: {
+			title: 'G150: Providing text based alternatives for live audio-only content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G150'
+		},
+		G151: {
+			title: 'G151: Providing a link to a text transcript of a prepared statement or script if the script is followed',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G151'
+		},
+		G157: {
+			title: 'G157: Incorporating a live audio captioning service into a Web page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G157'
+		},
+		H42: {
+			title: 'H42: Using h1-h6 to identify headings',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H42'
+		},
+		H93: {
+			title: 'H93: Ensuring that id attributes are unique on a Web page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H93'
+		},
+		H44: {
+			title: 'H44: Using label elements to associate text labels with form controls',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H44'
+		},
+		H65: {
+			title: 'H65: Using the title attribute to identify form controls when the label element cannot be used',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H65'
+		},
+		H49: {
+			title: 'H49: Using semantic markup to mark emphasized or special text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H49'
+		},
+		H63: {
+			title: 'H63: Using the scope attribute to associate header cells and data cells in data tables',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H63'
+		},
+		H43: {
+			title: 'H43: Using id and headers attributes to associate data cells with header cells in data tables',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H43'
+		},
+		H39: {
+			title: 'H39: Using caption elements to associate data table captions with data tables',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H39'
+		},
+		H73: {
+			title: 'H73: Using the summary attribute of the table element to give an overview of data tables',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H73'
+		},
+		H71: {
+			title: 'H71: Providing a description for groups of form controls using fieldset and legend elements ',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H71'
+		},
+		H85: {
+			title: 'H85: Using OPTGROUP to group OPTION elements inside a SELECT',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H85'
+		},
+		H48: {
+			title: 'H48: Using ol, ul and dl for lists or groups of links',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H48'
+		},
+		G141: {
+			title: 'G141: Organizing a page using headings',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G141'
+		},
+		G57: {
+			title: 'G57: Ordering the content in a meaningful sequence',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G57'
+		},
+		G96: {
+			title: 'G96: Providing textual identification of items that otherwise rely only on sensory information to be understood',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G96'
+		},
+		G14: {
+			title: 'G14: Ensuring that information conveyed by color differences is also available in text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G14'
+		},
+		G182: {
+			title: 'G182: Ensuring that additional visual cues are available when text color differences are used to convey information',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G182'
+		},
+		F23: {
+			title: 'F23: Failure of  1.4.2 due to playing a sound longer than 3 seconds where there is no mechanism to turn it off',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F23'
+		},
+		G18: {
+			title: 'G18: Ensuring that a contrast ratio of at least 4.5:1 exists between text (and images of text) and background behind the text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G18'
+		},
+		G145: {
+			title: 'G145: Ensuring that a contrast ratio of at least 3:1 exists between text (and images of text) and background behind the text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G145'
+		},
+		F24: {
+			title: 'F24: Failure of Success Criterion 1.4.3, 1.4.6 and 1.4.8 due to specifying foreground colors without specifying background colors or vice versa',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F24'
+		},
+		G142: {
+			title: 'G142: Using a technology that has commonly-available user agents that support zoom',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G142'
+		},
+		G140: {
+			title: 'G140: Separating information and structure from presentation to enable different presentations',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G140'
+		},
+		C22: {
+			title: 'C22: Using CSS to control visual presentation of text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/C22'
+		},
+		C30: {
+			title: 'C30: Using CSS to replace text with images of text and providing user interface controls to switch',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/C30'
+		},
+		G17: {
+			title: 'G17: Ensuring that a contrast ratio of at least 7:1 exists between text (and images of text) and background behind the text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G17'
+		},
+		G56: {
+			title: 'G56: Mixing audio files so that non-speech sounds are at least 20 decibels lower than the speech audio content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G56'
+		},
+		G148: {
+			title: 'G148: Not specifying background color, not specifying text color, and not using technology features that change those defaults',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G148'
+		},
+		G156: {
+			title: 'G156: Using a technology that has commonly-available user agents that can change the foreground and background of blocks of text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G156'
+		},
+		G175: {
+			title: 'G175: Providing a multi color selection tool on the page for foreground and background colors',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G175'
+		},
+		H87: {
+			title: 'G146: Using liquid layout',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G146'
+		},
+		C19: {
+			title: 'C19: Specifying alignment either to the left OR right in CSS',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/C19'
+		},
+		G172: {
+			title: 'G172: Providing a mechanism to remove full justification of text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G172'
+		},
+		G169: {
+			title: 'G169: Aligning text on only one side',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G169'
+		},
+		G188: {
+			title: 'G188: Providing a button on the page to increase line spaces and paragraph spaces',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G188'
+		},
+		C21: {
+			title: 'C21: Specifying line spacing in CSS',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/C21'
+		},
+		SCR20: {
+			title: 'SCR20: Using both keyboard and other device-specific functions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR20'
+		},
+		F10: {
+			title: 'F10: Failure of Success Criterion 2.1.2 and Conformance Requirement 5 due to combining multiple content formats in a way that traps users inside one format type',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F10'
+		},
+		F40: {
+			title: 'F40: Failure of Success Criterion 2.2.1 and 2.2.4 due to using meta redirect with a time limit',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F40'
+		},
+		F41: {
+			title: 'F41: Failure of Success Criterion 2.2.1, 2.2.4, and 3.2.5 due to using meta refresh to reload the page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F41'
+		},
+		SCR33: {
+			title: 'SCR33: Using script to scroll content, and providing a mechanism to pause it',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR33'
+		},
+		SCR22: {
+			title: 'SCR22: Using scripts to control blinking and stop it in five seconds or less',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR22'
+		},
+		G187: {
+			title: 'G187: Using a technology to include blinking content that can be turned off via the user agent',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G187'
+		},
+		G152: {
+			title: 'G152: Setting animated gif images to stop blinking after n cycles (within 5 seconds)',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G152'
+		},
+		G186: {
+			title: 'G186: Using a control in the Web page that stops moving, blinking, or auto-updating content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G186'
+		},
+		G191: {
+			title: 'G191: Providing a link, button, or other mechanism that reloads the page without any blinking content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G191'
+		},
+		F4: {
+			title: 'F4: Failure of Success Criterion 2.2.2 due to using text-decoration:blink without a mechanism to stop it in less than five seconds',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F4'
+		},
+		F47: {
+			title: 'F47: Failure of Success Criterion 2.2.2 due to using the blink element',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F47'
+		},
+		G5: {
+			title: 'G5: Allowing users to complete an activity without any time limit',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G5'
+		},
+		SCR14: {
+			title: 'SCR14: Using scripts to make nonessential alerts optional',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR14'
+		},
+		G105: {
+			title: 'G105: Saving data so that it can be used after a user re-authenticates',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G105'
+		},
+		G181: {
+			title: 'G181: Encoding user data as hidden or encrypted data in a re-authorization page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G181'
+		},
+		G19: {
+			title: 'G19: Ensuring that no component of the content flashes more than three times in any 1-second period',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G19'
+		},
+		G176: {
+			title: 'G176: Keeping the flashing area small enough',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G176'
+		},
+		H64: {
+			title: 'H64: Using the title attribute of the frame and iframe elements',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H64'
+		},
+		G1: {
+			title: 'G1: Adding a link at the top of each page that goes directly to the main content area',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G1'
+		},
+		G123: {
+			title: 'G123: Adding a link at the beginning of a block of repeated content to go to the end of the block',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G123'
+		},
+		G124: {
+			title: 'G124: Adding links at the top of the page to each area of the content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G124'
+		},
+		H69: {
+			title: 'H69: Providing heading elements at the beginning of each section of content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H69'
+		},
+		H25: {
+			title: 'H25: Providing a title using the title element',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H25'
+		},
+		H4: {
+			title: 'H4: Creating a logical tab order through links, form controls, and objects',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H4'
+		},
+		H77: {
+			title: 'H77: Identifying the purpose of a link using link text combined with its enclosing list item',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H77'
+		},
+		H78: {
+			title: 'H78: Identifying the purpose of a link using link text combined with its enclosing paragraph',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H78'
+		},
+		H79: {
+			title: 'H79: Identifying the purpose of a link in a data table using the link text combined with its enclosing table cell and associated table header cells',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H79'
+		},
+		H80: {
+			title: 'H80: Identifying the purpose of a link using link text combined with the preceding heading element',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H80'
+		},
+		H81: {
+			title: 'H81: Identifying the purpose of a link in a nested list using link text combined with the parent list item under which the list is nested',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H81'
+		},
+		H33: {
+			title: 'H33: Supplementing link text with the title attribute',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H33'
+		},
+		G125: {
+			title: 'G125: Providing links to navigate to related Web pages',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G125'
+		},
+		G64: {
+			title: 'G64: Providing a Table of Contents',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G64'
+		},
+		G63: {
+			title: 'G63: Providing a site map',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G63'
+		},
+		G161: {
+			title: 'G161: Providing a search function to help users find content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G161'
+		},
+		G126: {
+			title: 'G126: Providing a list of links to all other Web pages',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G126'
+		},
+		G185: {
+			title: 'G185: Linking to all of the pages on the site from the home page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G185'
+		},
+		G130: {
+			title: 'G130: Providing descriptive headings',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G130'
+		},
+		G131: {
+			title: 'G131: Providing descriptive labels',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G131'
+		},
+		G149: {
+			title: 'G149: Using user interface components that are highlighted by the user agent when they receive focus',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G149'
+		},
+		G165: {
+			title: 'G165: Using the default focus indicator for the platform so that high visibility default focus indicators will carry over',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G165'
+		},
+		G195: {
+			title: 'G195: Using an author-supplied, highly visible focus indicator',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G195'
+		},
+		C15: {
+			title: 'C15: Using CSS to change the presentation of a user interface component when it receives focus',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/C15'
+		},
+		SCR31: {
+			title: 'SCR31: Using script to change the background color or border of the element with focus',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR31'
+		},
+		H59: {
+			title: 'H59: Using the link element and navigation tools',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H59'
+		},
+		H57: {
+			title: 'H57: Using language attributes on the html element ',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H57'
+		},
+		H58: {
+			title: 'H58: Using language attributes to identify changes in the human language ',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H58'
+		},
+		H40: {
+			title: 'H40: Using description lists',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H40'
+		},
+		H54: {
+			title: 'H54: Using the dfn element to identify the defining instance of a word',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H54'
+		},
+		H60: {
+			title: 'H60: Using the link element to link to a glossary',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H60'
+		},
+		G62: {
+			title: 'G62: Providing a glossary',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G62'
+		},
+		G70: {
+			title: 'G70: Providing a function to search an online dictionary',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G70'
+		},
+		G102: {
+			title: 'G102: Providing the expansion or explanation of an abbreviation',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G102'
+		},
+		G55: {
+			title: 'G55: Linking to definitions',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G55'
+		},
+		H28: {
+			title: 'H28: Providing definitions for abbreviations by using the abbr element',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H28'
+		},
+		G97: {
+			title: 'G97: Providing the first use of an abbreviation immediately before or after the expanded form',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G97'
+		},
+		G86: {
+			title: 'G86: Providing a text summary that can be understood by people with lower secondary education level reading ability',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G86'
+		},
+		G103: {
+			title: 'G103: Providing visual illustrations, pictures, and symbols to help explain ideas, events, and processes',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G103'
+		},
+		G79: {
+			title: 'G79: Providing a spoken version of the text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G79'
+		},
+		G153: {
+			title: 'G153: Making the text easier to read',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G153'
+		},
+		G160: {
+			title: 'G160: Providing sign language versions of information, ideas, and processes that must be understood in order to use the content',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G160'
+		},
+		H62: {
+			title: 'H62: Using the ruby element',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H62'
+		},
+		G107: {
+			title: 'G107: Using \'activate\' rather than \'focus\' as a trigger for changes of context',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G107'
+		},
+		H32: {
+			title: 'H32: Providing submit buttons',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H32'
+		},
+		G61: {
+			title: 'G61: Presenting repeated components in the same relative order each time they appear',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G61'
+		},
+		G197: {
+			title: 'G197: Using labels, names, and text alternatives consistently for content that has the same functionality',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G197'
+		},
+		H83: {
+			title: 'H83: Using the target attribute to open a new window on user request and indicating this in link text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H83'
+		},
+		G83: {
+			title: 'G83: Providing text descriptions to identify required fields that were not completed',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G83'
+		},
+		G84: {
+			title: 'G84: Providing a text description when the user provides information that is not in the list of allowed values',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G84'
+		},
+		G85: {
+			title: 'G85: Providing a text description when user input falls outside the required format or values',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G85'
+		},
+		G89: {
+			title: 'G89: Providing expected data format and example',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G89'
+		},
+		G184: {
+			title: 'G184: Providing text instructions at the beginning of a form or set of fields that describes the necessary input',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G184'
+		},
+		H90: {
+			title: 'H90: Indicating required form controls using label or legend',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H90'
+		},
+		G177: {
+			title: 'G177: Providing suggested correction text',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G177'
+		},
+		G98: {
+			title: 'G98: Providing the ability for the user to review and correct answers before submitting',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G98'
+		},
+		G99: {
+			title: 'G99: Providing the ability to recover deleted information',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G99'
+		},
+		G155: {
+			title: 'G155: Providing a checkbox in addition to a submit button',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G155'
+		},
+		G164: {
+			title: 'G164: Providing a stated time within which an online request (or transaction) may be amended or canceled by the user after making the request',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G164'
+		},
+		G168: {
+			title: 'G168: Requesting confirmation to continue with selected action',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G168'
+		},
+		G71: {
+			title: 'G71: Providing a help link on every Web page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G71'
+		},
+		G193: {
+			title: 'G193: Providing help by an assistant in the Web page',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/G193'
+		},
+		F77: {
+			title: 'F77: Failure of Success Criterion 4.1.1 due to duplicate values of type ID',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/F77'
+		},
+		H91: {
+			title: 'H91: Using HTML form controls and links',
+			url: 'http://www.w3.org/TR/WCAG20-TECHS/H91'
+		},
+		F102: {
+			title: 'F102: Failure of Success Criterion 1.4.10 due to content disappearing and not being available when content has reflowed',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F102'
+		},
+		F103: {
+			title: 'F103: Failure of Success Criterion 4.1.3 due to providing status messages that cannot be programmatically determined through role or properties',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F103'
+		},
+		F104: {
+			title: 'F104: Failure of Success Criterion 1.4.12 due to clipped or overlapped content when text spacing is adjusted',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F104'
+		},
+		F105: {
+			title: 'F105: Failure of Success Criterion 2.5.1 due to providing functionality via a path- based gesture without simple pointer alternative',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F105'
+		},
+		F106: {
+			title: 'F106: Failure due to inability to deactivate motion actuation',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F106'
+		},
+		G216: {
+			title: 'G216: Providing single point activation for a control slider',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G216'
+		},
+		G215: {
+			title: 'G215: Providing controls to achieve the same result as path based or multipoint gestures',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G215'
+		},
+		F100: {
+			title: 'F100: Failure of Success Criterion 1.3.4 due to showing a message asking to reorient device',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F100'
+		},
+		G214: {
+			title: 'G214: Using a control to allow access to content in different orientations which is otherwise restricted',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G214'
+		},
+		C40: {
+			title: 'C40: Creating a two-color focus indicator to ensure sufficient contrast with all components',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/css/C40'
+		},
+		F99: {
+			title: 'F99: Failure of Success Criterion 2.1.4 due to implementing character key shortcuts that cannot be turned off or remapped',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F99'
+		},
+		SCR39: {
+			title: 'SCR39: Making content on focus or hover hoverable, dismissible, and persistent',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/client-side-script/SCR39'
+		},
+		G212: {
+			title: 'G212: Using native controls to ensure functionality is triggered on the up-event.',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G212'
+		},
+		F98: {
+			title: 'F98: Failure due to interactions being limited to touch-only on touchscreen devices',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F98'
+		},
+		G213: {
+			title: 'G213: Provide conventional controls and an application setting for motion activated input',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G213'
+		},
+		ARIA24: {
+			title: 'ARIA24: Semantically identifying a font icon with role="img"',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/aria/ARIA24'
+		},
+		F97: {
+			title: 'F97: Failure due to locking the orientation to landscape or portrait view',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F97'
+		},
+		F52: {
+			title: 'F52: Failure of Success Criterion 3.2.1 and 3.2.5 due to opening a new window as soon as a new page is loaded ',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F52'
+		},
+		G209: {
+			title: 'G209: Provide sufficient contrast at the boundaries between adjoining colors',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G209'
+		},
+		C39: {
+			title: 'C39: Using the CSS reduce-motion query to prevent motion',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/css/C39'
+		},
+		G207: {
+			title: 'G207: Ensuring that a contrast ratio of 3:1 is provided for icons',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/general/G207'
+		},
+		C38: {
+			title: 'C38: Using CSS width, max-width and flexbox to fit labels and inputs',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/css/C38'
+		},
+		C34: {
+			title: 'C34: Using media queries to un-fixing sticky headers / footers',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/css/C34'
+		},
+		C36: {
+			title: 'C36: Allowing for text spacing override',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/css/C36'
+		},
+		C37: {
+			title: 'C37: Using CSS max-width and height to fit images',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/css/C37'
+		},
+		F95: {
+			title: 'F95: Failure of Success Criterion 1.4.13 due to content shown on hover not being hoverable',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F95'
+		},
+		F96: {
+			title: 'F96: Failure due to the accessible name not containing the visible label text',
+			url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F96'
+		}
+	};
+}

index.js

@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-const chalk = require('chalk');
+const kleur = require('kleur');
 const config = require('./config');
 
 process.on('SIGINT', () => {
@@ -23,28 +22,39 @@ process.on('SIGINT', () => {
 	process.exit();
 });
 
-require('./app')(config, (err, app) => {
+require('./app')(config, (error, app) => {
+	if (error) {
+		console.error(error.stack);
+		process.exit(1);
+	}
 
 	console.log('');
-	console.log(chalk.underline.magenta('Pa11y Dashboard started'));
+	console.log(kleur.underline().magenta('Pa11y Dashboard started'));
-	console.log(chalk.grey('mode: %s'), process.env.NODE_ENV);
+	console.log(kleur.grey('mode: %s'), process.env.NODE_ENV);
-	console.log(chalk.grey('uri:  %s'), app.address);
+	console.log(kleur.grey('uri:  %s'), app.address);
 
-	app.on('route-error', err => {
+	app.on('route-error', routeError => {
-		const stack = (err.stack ? err.stack.split('\n') : [err.message]);
+		const stack = (routeError.stack ? routeError.stack.split('\n') : [routeError.message]);
-		const msg = chalk.red(stack.shift());
+		const msg = kleur.red(stack.shift());
 		console.error('');
 		console.error(msg);
-		console.error(chalk.grey(stack.join('\n')));
+		console.error(kleur.grey(stack.join('\n')));
 	});
 
 	// Start the webservice if required
 	if (typeof config.webservice === 'object') {
-		require('pa11y-webservice')(config.webservice, (err, webservice) => {
+		require('pa11y-webservice')(config.webservice, (webserviceError, webservice) => {
+			if (webserviceError) {
+				console.error(webserviceError.stack);
+				process.exit(1);
+			}
+
 			console.log('');
-			console.log(chalk.underline.cyan('Pa11y Webservice started'));
+			console.log(kleur.underline().cyan('Pa11y Webservice started'));
-			console.log(chalk.grey('mode: %s'), process.env.NODE_ENV);
+			console.log(kleur.grey('mode:     %s'), process.env.NODE_ENV);
-			console.log(chalk.grey('uri:  %s'), webservice.server.info.uri);
+			console.log(kleur.grey('uri:      %s'), webservice.server.info.uri);
+			console.log(kleur.grey('database: %s'), config.webservice.database);
+			console.log(kleur.grey('cron:     %s'), config.webservice.cron);
 		});
 	}
 

package.json

@@ -1,15 +1,18 @@
 {
   "name": "pa11y-dashboard",
-	"version": "2.1.1",
+  "version": "4.2.0",
   "private": true,
-
   "description": "Pa11y Dashboard is a visual web interface to the Pa11y accessibility reporter",
-	"keywords": [ "accessibility", "analysis", "report" ],
+  "keywords": [
+    "accessibility",
+    "analysis",
+    "report"
+  ],
+  "author": "Team Pa11y",
   "contributors": [
     "Perry Harlock (http://www.phwebs.co.uk/)",
     "Rowan Manning (http://rowanmanning.com/)"
   ],
-
   "repository": {
     "type": "git",
     "url": "https://github.com/pa11y/dashboard.git"
@@ -17,34 +20,34 @@
   "homepage": "https://github.com/pa11y/dashboard",
   "bugs": "https://github.com/pa11y/dashboard/issues",
   "license": "GPL-3.0",
-
   "engines": {
-		"node": ">=4"
+    "node": ">=12 <16"
   },
   "dependencies": {
-		"body-parser": "~1.15",
+    "body-parser": "~1.19.2",
-		"chalk": "~1.1",
+    "compression": "~1.7.4",
-		"compression": "~1.6",
+    "express": "~4.17.3",
-		"express": "~4.14",
+    "express-hbs": "~2.4.0",
-		"express-hbs": "~1.0",
+    "http-headers": "~3.0.2",
-		"http-headers": "^3.0.1",
+    "kleur": "~4.1.4",
-		"moment": "~2.13",
+    "moment": "~2.29.1",
-		"pa11y-webservice": "^2.1.2",
+    "morgan": "~1.10.0",
-		"pa11y-webservice-client-node": "^1.2.1",
+    "nanoid": "~3.3.2",
-		"underscore": "~1.8"
+    "pa11y-webservice": "~4.0.1",
+    "pa11y-webservice-client-node": "~3.0.0",
+    "underscore": "~1.13.2"
   },
   "devDependencies": {
-		"bower": "~1.7",
+    "bower": "^1.8.13",
-		"cheerio": "~0.20",
+    "cheerio": "^1.0.0-rc.10",
-		"jscs": "^2",
+    "eslint": "^7.27.0",
-		"jshint": "^2",
+    "less": "^3.11.1",
-		"less": "~2.7",
+    "mocha": "^10.2.0",
-		"mocha": "^2",
+    "pa11y-lint-config": "^2.0.0",
-		"proclaim": "^3",
+    "proclaim": "^3.6.0",
-		"request": "^2.74",
+    "request": "^2.88.2",
-		"uglify-js": "~2.6"
+    "uglify-js": "^3.11.0"
   },
-
   "scripts": {
     "start": "node index.js",
     "test": "make ci"

public/js/site.js

@@ -18,13 +18,17 @@ $(document).ready(function(){
     var data = {};
 	var standardsList = $('[data-role="standards-list"]');
 	var standardSelect = $('[data-role="new-task-select"]');
-	var expandLink = $('[data-role="expander"]');
     var taskListSelector = $('[data-role="task-list"] a');
+	var detailsCollapse = $('[data-role="details-collapse"]');
+	var contextPopover = $('[data-role="context-popover"]');
+	var ruleTooltip = $('[data-role="rule-tooltip"]');
     var toTopLinks = $('[data-role="top"]');
     var zoomResetButton = $('[data-role="zoom-reset"]');
     var graphContainer = $('[data-role="graph"]');
     var dateSelectDropdownMenu = $('[data-role="date-select-dropdown-menu"]');
     var legend = graphContainer.parent('.graph-container').find('.dashedLegend');
+	var list = localStorage.getItem("listview") || "";    // get choice or nothing
+
 
     var graphOptions = {
         series: {
@@ -73,32 +77,25 @@ $(document).ready(function(){
         $('body').addClass('custom-legend');
     }
 
-    // Toggle appearance of lists of error/warnings/notices
+	// Update details button title by click
-    expandLink.click( function(){
+	detailsCollapse.click(function(){
-		$(this).next().slideToggle('slow', function(){});
+		$(this).toggleClass('btn_state_collapsed');
-        if ($(this).hasClass('showing')) {
-            $(this).find('span.expander').html('↓');
-            $(this).attr('aria-expanded', false);
-        }
-        else {
-            $(this).find('span.expander').html('↑');
-            $(this).attr('aria-expanded', true);
-        }
-        $(this).toggleClass('showing');
 	});
-    $(document).on('keydown.lists', '[data-role="expander"]', function (e) {
-        var $this = $(this);
-        var k = e.which || e.keyCode;
 
-        if (!/(13|32)/.test(k)) {
+	// Initialize context popovers
-            return;
+	$(contextPopover).popover({
-        }
+		container: 'body',
-        if (k === 13 || k === 32) {
+		placement: 'bottom'
-            $this.click();
+	});
-        }
 
-        e.preventDefault();
+	$(document.body).click(function (e) {
-        e.stopPropagation();
+		$(contextPopover).each(function () {
+			if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
+				if ($(this).data('bs.popover').tip().hasClass('in')) {
+					$(this).popover('toggle');
+				}
+			}
+		});
 	});
 
      // Back to top links
@@ -137,7 +134,7 @@ $(document).ready(function(){
         plotGraphData();
     });
 
-    $('[data-role="rules-tooltip"]').tooltip();
+    ruleTooltip.tooltip();
 
     // Function to animate sections
     function animateSection (sectionName, offset){
@@ -177,6 +174,7 @@ $(document).ready(function(){
 
     function plotGraphData () {
         $.plot(graphContainer, getData(), graphOptions);
+        exportGraph();
     }
 
     function getData() {
@@ -207,6 +205,37 @@ $(document).ready(function(){
         zoomResetButton.toggleClass('hidden');
     }
 
+	function exportGraph() {
+		var exportBtn = $('.btn_action_export');
+
+		exportBtn.click(function(e) {
+			e.preventDefault();
+
+			var fileName = $('h1').text().toLowerCase().split(' ').join('_');
+			var date = new Date();
+
+			fileName += '_' + date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear();
+
+			html2canvas($('.graph').get(0), {
+				onrendered: function (canvas) {
+					downloadFile(canvas.toDataURL('image/png'), fileName + '.png');
+				}
+			});
+		});
+	}
+
+	function downloadFile(dataurl, filename) {
+		var link = document.createElement('a');
+		link.href = dataurl;
+		link.setAttribute('download', filename);
+
+		var clickEvent = document.createEvent('MouseEvents');
+		clickEvent.initEvent('click', false, true);
+		link.dispatchEvent(clickEvent);
+
+		return false;
+	}
+
     graphContainer.bind('plotselected', function (event, ranges) {
         // clamp the zooming to prevent eternal zoom
         if (ranges.xaxis.to - ranges.xaxis.from < 0.00001) {
@@ -287,7 +316,7 @@ $(document).ready(function(){
     var previousPoint = null;
     graphContainer.bind('plothover', function (event, pos, item) {
         if (item) {
-            if (previousPoint != item.dataIndex) {
+            if (previousPoint !== item.dataIndex) {
                 previousPoint = item.dataIndex;
                 $('[data-role="tooltip"]').remove();
                 var count = item.datapoint[1].toFixed(0);
@@ -370,4 +399,38 @@ $(document).ready(function(){
 		$.fn.collapse.Constructor.prototype.keydown
 	);
 
+	// List View
+	$('.btn-list').click(function () {
+		var elements = $("#grid-container .task-card");
+		for (i = 0; i < elements.length; i++) {
+			$(elements[i]).removeClass('col-md-4 col-sm-6');
+			$(elements[i]).addClass('col-md-12');
+			$(elements[i]).find('.gridview:nth-child(1)').addClass('listview col-md-9 col-sm-8');
+			$(elements[i]).find('.gridview:nth-child(2)').addClass('listview col-md-3 col-sm-4 task-actions clearfix');
+			$(elements[i]).find('.gridview').removeClass('gridview');
+		};
+		$('.view-btn').removeClass('btn-default')
+		$(this).addClass('btn-default');
+		localStorage.setItem("listview", "yes") //save the choice
+	});
+
+	// Grid View
+	$('.btn-grid').click(function () {
+		var elements = $("#grid-container .task-card");
+		for (i = 0; i < elements.length; i++) {
+			$(elements[i]).removeClass('col-md-12');
+			$(elements[i]).addClass('col-md-4 col-sm-6');
+			$(elements[i]).find('.listview').addClass('gridview')
+			$(elements[i]).find('.listview:nth-child(1)').removeClass('listview col-md-9 col-sm-8');
+			$(elements[i]).find('.listview:nth-child(2)').removeClass('listview col-md-3 col-sm-4 task-actions clearfix');
+		};
+		$('.view-btn').removeClass('btn-default')
+		$(this).addClass('btn-default')
+		localStorage.setItem("listview", "") //clears the choice
+	});
+
+	//load the view as per user's choice
+	if (list === 'yes') {
+		$('.btn-list').trigger('click');
+	}
 });

public/js/vendor/bootstrap/_layouts/default.html

@@ -43,9 +43,9 @@
             </ul>
           </div>
         </div>
-        <div class="col-md-9" role="main">
+        <main class="col-md-9" role="main">
           {{ content }}
-        </div>
+        </main>
       </div>
 
     </div>

public/js/vendor/bootstrap/js/tab.js

@@ -68,10 +68,12 @@
     function next() {
       $active
         .removeClass('active')
+        .attr('aria-selected', false)
         .find('> .dropdown-menu > .active')
         .removeClass('active')
 
       element.addClass('active')
+      element.attr('aria-selected', true)
 
       if (transition) {
         element[0].offsetWidth // reflow for transition

public/js/vendor/bootstrap/js/tests/unit/alert.js

@@ -32,7 +32,7 @@ $(function () {
         $.support.transition = false
 
         var alertHTML = '<div class="alert-message warning fade in">'
-          + '<a class="close" href="#" data-dismiss="alert">×</a>'
+          + '<a class="close" href="#" data-dismiss="alert" aria-label="Close">×</a>'
           + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
           + '</div>'
           , alert = $(alertHTML).appendTo('#qunit-fixture').alert()

public/less/alerts.less

@@ -2,7 +2,6 @@
 // Alerts
 // --------------------------------------------------
 
-
 // Base styles
 // -------------------------
 
@@ -18,6 +17,7 @@
 	// Specified for the h4 to prevent conflicts of changing @headingsColor
 	color: inherit;
   }
+
   // Provide class for links that match alerts
   .alert-link {
 	font-weight: @alert-link-font-weight;
@@ -56,12 +56,15 @@
 .alert-success {
   .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
 }
+
 .alert-info {
   .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);
 }
+
 .alert-warning {
   .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);
 }
+
 .alert-danger {
   .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
 }

public/less/badges.less

@@ -2,7 +2,6 @@
 // Badges
 // --------------------------------------------------
 
-
 // Base classes
 .badge {
   display: inline-block;
@@ -46,6 +45,7 @@ a.list-group-item.active > .badge,
   color: @badge-active-color;
   background-color: @badge-active-bg;
 }
+
 .nav-pills > li > a > .badge {
   margin-left: 3px;
 }

public/less/bootswatch.less

@@ -39,7 +39,6 @@
 // Tables =====================================================================
 
 .table {
-
   tr.success,
   tr.warning,
   tr.danger {
@@ -112,7 +111,6 @@ input[type="color"],
 // Navs =======================================================================
 
 .pagination {
-	
   a {
 	color: #fff;
 
@@ -152,7 +150,6 @@ input[type="color"],
 // Indicators =================================================================
 
 .alert {
-
   a,
   .alert-link {
 	color: #fff;

public/less/breadcrumbs.less

@@ -2,7 +2,6 @@
 // Breadcrumbs
 // --------------------------------------------------
 
-
 .breadcrumb {
   padding: 8px 15px;
   margin-bottom: @line-height-computed;

public/less/button-groups.less

@@ -10,6 +10,7 @@
   .btn-default & {
 	border-top-color: @btn-default-color;
   }
+
   .btn-primary &,
   .btn-success &,
   .btn-warning &,
@@ -18,10 +19,12 @@
 	border-top-color: #fff;
   }
 }
+
 .dropup {
   & .btn-default .caret {
 	border-bottom-color: @btn-default-color;
   }
+
   .btn-primary,
   .btn-success,
   .btn-warning,
@@ -94,6 +97,7 @@
 	.border-right-radius(0);
   }
 }
+
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
 .btn-group > .btn:last-child:not(:first-child),
 .btn-group > .dropdown-toggle:not(:first-child) {
@@ -104,15 +108,18 @@
 .btn-group > .btn-group {
   float: left;
 }
+
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
+
 .btn-group > .btn-group:first-child {
   > .btn:last-child,
   > .dropdown-toggle {
 	.border-right-radius(0);
   }
 }
+
 .btn-group > .btn-group:last-child > .btn:first-child {
   .border-left-radius(0);
 }
@@ -123,15 +130,21 @@
   outline: 0;
 }
 
-
 // Sizing
 //
 // Remix the default button sizing classes into new ones for easier manipulation.
 
-.btn-group-xs > .btn { .btn-xs(); }
+.btn-group-xs > .btn {
-.btn-group-sm > .btn { .btn-sm(); }
+  .btn-xs();
-.btn-group-lg > .btn { .btn-lg(); }
+}
 
+.btn-group-sm > .btn {
+  .btn-sm();
+}
+
+.btn-group-lg > .btn {
+  .btn-lg();
+}
 
 // Split button dropdowns
 // ----------------------
@@ -141,6 +154,7 @@
   padding-left: 8px;
   padding-right: 8px;
 }
+
 .btn-group > .btn-lg + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
@@ -152,22 +166,22 @@
   .box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125));
 }
 
-
 // Reposition the caret
 .btn .caret {
   margin-left: 0;
 }
+
 // Carets in other button sizes
 .btn-lg .caret {
   border-width: @caret-width-large @caret-width-large 0;
   border-bottom-width: 0;
 }
+
 // Upside down carets for .dropup
 .dropup .btn-lg .caret {
   border-width: 0 @caret-width-large @caret-width-large;
 }
 
-
 // Vertical button groups
 // ----------------------
 
@@ -210,21 +224,22 @@
 	.border-top-radius(0);
   }
 }
+
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
+
 .btn-group-vertical > .btn-group:first-child {
   > .btn:last-child,
   > .dropdown-toggle {
 	.border-bottom-radius(0);
   }
 }
+
 .btn-group-vertical > .btn-group:last-child > .btn:first-child {
   .border-top-radius(0);
 }
 
-
-
 // Justified button groups
 // ----------------------
 
@@ -233,6 +248,7 @@
   width: 100%;
   table-layout: fixed;
   border-collapse: separate;
+
   .btn {
 	float: none;
 	display: table-cell;
@@ -240,7 +256,6 @@
   }
 }
 
-
 // Checkbox and radio options
 [data-toggle="buttons"] > .btn > input[type="radio"],
 [data-toggle="buttons"] > .btn > input[type="checkbox"] {

public/less/buttons.less

@@ -2,7 +2,6 @@
 // Buttons
 // --------------------------------------------------
 
-
 // Base styles
 // --------------------------------------------------
 
@@ -51,34 +50,37 @@
 
 }
 
-
 // Alternate buttons
 // --------------------------------------------------
 
 .btn-default {
   .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
 }
+
 .btn-primary {
   .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
 }
+
 // Warning appears as orange
 .btn-warning {
   .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
 }
+
 // Danger and error appear as red
 .btn-danger {
   .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
 }
+
 // Success appears as green
 .btn-success {
   .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
 }
+
 // Info appears as blue-green
 .btn-info {
   .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
 }
 
-
 // Link buttons
 // -------------------------
 
@@ -118,7 +120,6 @@
   }
 }
 
-
 // Button Sizes
 // --------------------------------------------------
 
@@ -126,16 +127,17 @@
   // line-height: ensure even-numbered height of button next to large input
   .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
+
 .btn-sm,
 .btn-xs {
   // line-height: ensure proper height of button next to small input
   .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
+
 .btn-xs {
   padding: 1px 5px;
 }
 
-
 // Block button
 // --------------------------------------------------
 

public/less/carousel.less

@@ -2,7 +2,6 @@
 // Carousel
 // --------------------------------------------------
 
-
 // Wrapper for the slide container and indicators
 .carousel {
   position: relative;
@@ -28,7 +27,9 @@
 
   > .active,
   > .next,
-  > .prev { display: block; }
+  > .prev {
+	display: block;
+  }
 
   > .active {
 	left: 0;
@@ -106,14 +107,17 @@
 	z-index: 5;
 	display: inline-block;
   }
+
   .icon-prev,
   .glyphicon-chevron-left {
 	left: 50%;
   }
+
   .icon-next,
   .glyphicon-chevron-right {
 	right: 50%;
   }
+
   .icon-prev,
   .icon-next {
 	width: 20px;
@@ -128,6 +132,7 @@
 	  content: '\2039'; // SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
 	}
   }
+
   .icon-next {
 	&:before {
 	  content: '\203a'; // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
@@ -161,6 +166,7 @@
 	border-radius: 10px;
 	cursor: pointer;
   }
+
   .active {
 	margin: 0;
 	width: 12px;
@@ -183,15 +189,14 @@
   color: @carousel-caption-color;
   text-align: center;
   text-shadow: @carousel-text-shadow;
+
   & .btn {
 	text-shadow: none; // No shadow for button elements in carousel-caption
   }
 }
 
-
 // Scale up controls for tablets and up
 @media screen and (min-width: @screen-sm-min) {
-
   // Scale up the controls a smidge
   .carousel-control {
 	.glyphicons-chevron-left,

public/less/close.less

@@ -2,7 +2,6 @@
 // Close icons
 // --------------------------------------------------
 
-
 .close {
   float: right;
   font-size: (@font-size-base * 1.5);

public/less/code.less

@@ -2,7 +2,6 @@
 // Code (inline and blocK)
 // --------------------------------------------------
 
-
 // Inline and block code styles
 code,
 kdb,

public/less/component-animations.less

@@ -10,6 +10,7 @@
 .fade {
   opacity: 0;
   .transition(opacity .15s linear);
+
   &.in {
 	opacity: 1;
   }
@@ -17,10 +18,12 @@
 
 .collapse {
   display: none;
+
   &.in {
 	display: block;
   }
 }
+
 .collapsing {
   position: relative;
   height: 0;

public/less/dropdowns.less

@@ -2,7 +2,6 @@
 // Dropdown menus
 // --------------------------------------------------
 
-
 // Dropdown arrow/caret
 .caret {
   display: inline-block;
@@ -105,6 +104,7 @@
 	color: @dropdown-link-disabled-color;
   }
 }
+
 // Nuke hover/focus effects
 .dropdown-menu > .disabled > a {
   &:hover,
@@ -170,6 +170,7 @@
 	border-bottom: 4px solid @dropdown-caret-color;
 	content: "";
   }
+
   // Different positioning for bottom up menu
   .dropdown-menu {
 	top: auto;
@@ -178,7 +179,6 @@
   }
 }
 
-
 // Component alignment
 //
 // Reiterate per navbar.less and the modified component alignment there.

public/less/forms.less

@@ -2,7 +2,6 @@
 // Forms
 // --------------------------------------------------
 
-
 // Normalize non-controls
 //
 // Restyle and baseline non-control form elements.
@@ -31,7 +30,6 @@ label {
   font-weight: bold;
 }
 
-
 // Normalize form controls
 
 // Override content-box in Normalize (* isn't specific enough)
@@ -100,7 +98,6 @@ output {
   .placeholder();
 }
 
-
 // Common form controls
 //
 // Shared size and type resets for form controls. Apply `.form-control` to any
@@ -159,7 +156,6 @@ output {
   }
 }
 
-
 // Form groups
 //
 // Designed to help with the organization and spacing of vertical forms. For
@@ -169,7 +165,6 @@ output {
   margin-bottom: 15px;
 }
 
-
 // Checkboxes and radios
 //
 // Indent the labels to position radios/checkboxes as hanging controls.
@@ -182,6 +177,7 @@ output {
   margin-bottom: 10px;
   padding-left: 20px;
   vertical-align: middle;
+
   label {
 	display: inline;
 	margin-bottom: 0;
@@ -189,6 +185,7 @@ output {
 	cursor: pointer;
   }
 }
+
 .radio input[type="radio"],
 .radio-inline input[type="radio"],
 .checkbox input[type="checkbox"],
@@ -196,6 +193,7 @@ output {
   float: left;
   margin-left: -20px;
 }
+
 .radio + .radio,
 .checkbox + .checkbox {
   margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
@@ -211,6 +209,7 @@ output {
   font-weight: normal;
   cursor: pointer;
 }
+
 .radio-inline + .radio-inline,
 .checkbox-inline + .checkbox-inline {
   margin-top: 0;
@@ -241,7 +240,6 @@ input[type="checkbox"],
   .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
 
-
 // Form control feedback states
 //
 // Apply contextual and semantic states to individual form controls.
@@ -250,16 +248,17 @@ input[type="checkbox"],
 .has-warning {
   .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);
 }
+
 // Error
 .has-error {
   .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
 }
+
 // Success
 .has-success {
   .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
 }
 
-
 // Static form control text
 //
 // Apply class to a `p` element to make any string of text align with labels in
@@ -270,7 +269,6 @@ input[type="checkbox"],
   padding-top: (@padding-base-vertical + 1);
 }
 
-
 // Help text
 //
 // Apply to any element you wish to create light text for placement immediately
@@ -283,8 +281,6 @@ input[type="checkbox"],
   color: lighten(@text-color, 25%); // lighten the text some for contrast
 }
 
-
-
 // Inline forms
 //
 // Make forms appear inline(-block) by adding the `.form-inline` class. Inline
@@ -297,7 +293,6 @@ input[type="checkbox"],
 // Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
 
 .form-inline {
-
   // Kick in the inline
   @media (min-width: @screen-sm) {
 	// Inline-block all the things for "inline"
@@ -322,6 +317,7 @@ input[type="checkbox"],
 	  margin-bottom: 0;
 	  padding-left: 0;
 	}
+
 	.radio input[type="radio"],
 	.checkbox input[type="checkbox"] {
 	  float: none;
@@ -330,14 +326,12 @@ input[type="checkbox"],
   }
 }
 
-
 // Horizontal forms
 //
 // Horizontal forms are built on grid classes and allow you to create forms with
 // labels on the left and inputs on the right.
 
 .form-horizontal {
-
   // Consistent vertical alignment of labels, radios, and checkboxes
   .control-label,
   .radio,

public/less/grid.less

@@ -2,7 +2,6 @@
 // Grid system
 // --------------------------------------------------
 
-
 // Set the container width, and override it for fixed navbars in media queries
 .container {
   .container-fixed();
@@ -70,7 +69,6 @@
   padding-right: (@grid-gutter-width / 2);
 }
 
-
 // Extra small grid
 //
 // Grid classes for extra small devices like smartphones. No offset, push, or
@@ -92,19 +90,54 @@
 .col-xs-11 {
   float: left;
 }
-.col-xs-1  { width: percentage((1 / @grid-columns)); }
-.col-xs-2  { width: percentage((2 / @grid-columns)); }
-.col-xs-3  { width: percentage((3 / @grid-columns)); }
-.col-xs-4  { width: percentage((4 / @grid-columns)); }
-.col-xs-5  { width: percentage((5 / @grid-columns)); }
-.col-xs-6  { width: percentage((6 / @grid-columns)); }
-.col-xs-7  { width: percentage((7 / @grid-columns)); }
-.col-xs-8  { width: percentage((8 / @grid-columns)); }
-.col-xs-9  { width: percentage((9 / @grid-columns)); }
-.col-xs-10 { width: percentage((10/ @grid-columns)); }
-.col-xs-11 { width: percentage((11/ @grid-columns)); }
-.col-xs-12 { width: 100%; }
 
+.col-xs-1 {
+  width: percentage((1 / @grid-columns));
+}
+
+.col-xs-2 {
+  width: percentage((2 / @grid-columns));
+}
+
+.col-xs-3 {
+  width: percentage((3 / @grid-columns));
+}
+
+.col-xs-4 {
+  width: percentage((4 / @grid-columns));
+}
+
+.col-xs-5 {
+  width: percentage((5 / @grid-columns));
+}
+
+.col-xs-6 {
+  width: percentage((6 / @grid-columns));
+}
+
+.col-xs-7 {
+  width: percentage((7 / @grid-columns));
+}
+
+.col-xs-8 {
+  width: percentage((8 / @grid-columns));
+}
+
+.col-xs-9 {
+  width: percentage((9 / @grid-columns));
+}
+
+.col-xs-10 {
+  width: percentage((10/ @grid-columns));
+}
+
+.col-xs-11 {
+  width: percentage((11/ @grid-columns));
+}
+
+.col-xs-12 {
+  width: 100%;
+}
 
 // Small grid
 //
@@ -132,58 +165,189 @@
   .col-sm-11 {
 	float: left;
   }
-  .col-sm-1  { width: percentage((1 / @grid-columns)); }
-  .col-sm-2  { width: percentage((2 / @grid-columns)); }
-  .col-sm-3  { width: percentage((3 / @grid-columns)); }
-  .col-sm-4  { width: percentage((4 / @grid-columns)); }
-  .col-sm-5  { width: percentage((5 / @grid-columns)); }
-  .col-sm-6  { width: percentage((6 / @grid-columns)); }
-  .col-sm-7  { width: percentage((7 / @grid-columns)); }
-  .col-sm-8  { width: percentage((8 / @grid-columns)); }
-  .col-sm-9  { width: percentage((9 / @grid-columns)); }
-  .col-sm-10 { width: percentage((10/ @grid-columns)); }
-  .col-sm-11 { width: percentage((11/ @grid-columns)); }
-  .col-sm-12 { width: 100%; }
 
-  // Push and pull columns for source order changes
+  .col-sm-1 {
-  .col-sm-push-1  { left: percentage((1 / @grid-columns)); }
+	width: percentage((1 / @grid-columns));
-  .col-sm-push-2  { left: percentage((2 / @grid-columns)); }
-  .col-sm-push-3  { left: percentage((3 / @grid-columns)); }
-  .col-sm-push-4  { left: percentage((4 / @grid-columns)); }
-  .col-sm-push-5  { left: percentage((5 / @grid-columns)); }
-  .col-sm-push-6  { left: percentage((6 / @grid-columns)); }
-  .col-sm-push-7  { left: percentage((7 / @grid-columns)); }
-  .col-sm-push-8  { left: percentage((8 / @grid-columns)); }
-  .col-sm-push-9  { left: percentage((9 / @grid-columns)); }
-  .col-sm-push-10 { left: percentage((10/ @grid-columns)); }
-  .col-sm-push-11 { left: percentage((11/ @grid-columns)); }
-
-  .col-sm-pull-1  { right: percentage((1 / @grid-columns)); }
-  .col-sm-pull-2  { right: percentage((2 / @grid-columns)); }
-  .col-sm-pull-3  { right: percentage((3 / @grid-columns)); }
-  .col-sm-pull-4  { right: percentage((4 / @grid-columns)); }
-  .col-sm-pull-5  { right: percentage((5 / @grid-columns)); }
-  .col-sm-pull-6  { right: percentage((6 / @grid-columns)); }
-  .col-sm-pull-7  { right: percentage((7 / @grid-columns)); }
-  .col-sm-pull-8  { right: percentage((8 / @grid-columns)); }
-  .col-sm-pull-9  { right: percentage((9 / @grid-columns)); }
-  .col-sm-pull-10 { right: percentage((10/ @grid-columns)); }
-  .col-sm-pull-11 { right: percentage((11/ @grid-columns)); }
-
-  // Offsets
-  .col-sm-offset-1  { margin-left: percentage((1 / @grid-columns)); }
-  .col-sm-offset-2  { margin-left: percentage((2 / @grid-columns)); }
-  .col-sm-offset-3  { margin-left: percentage((3 / @grid-columns)); }
-  .col-sm-offset-4  { margin-left: percentage((4 / @grid-columns)); }
-  .col-sm-offset-5  { margin-left: percentage((5 / @grid-columns)); }
-  .col-sm-offset-6  { margin-left: percentage((6 / @grid-columns)); }
-  .col-sm-offset-7  { margin-left: percentage((7 / @grid-columns)); }
-  .col-sm-offset-8  { margin-left: percentage((8 / @grid-columns)); }
-  .col-sm-offset-9  { margin-left: percentage((9 / @grid-columns)); }
-  .col-sm-offset-10 { margin-left: percentage((10/ @grid-columns)); }
-  .col-sm-offset-11 { margin-left: percentage((11/ @grid-columns)); }
   }
 
+  .col-sm-2 {
+	width: percentage((2 / @grid-columns));
+  }
+
+  .col-sm-3 {
+	width: percentage((3 / @grid-columns));
+  }
+
+  .col-sm-4 {
+	width: percentage((4 / @grid-columns));
+  }
+
+  .col-sm-5 {
+	width: percentage((5 / @grid-columns));
+  }
+
+  .col-sm-6 {
+	width: percentage((6 / @grid-columns));
+  }
+
+  .col-sm-7 {
+	width: percentage((7 / @grid-columns));
+  }
+
+  .col-sm-8 {
+	width: percentage((8 / @grid-columns));
+  }
+
+  .col-sm-9 {
+	width: percentage((9 / @grid-columns));
+  }
+
+  .col-sm-10 {
+	width: percentage((10/ @grid-columns));
+  }
+
+  .col-sm-11 {
+	width: percentage((11/ @grid-columns));
+  }
+
+  .col-sm-12 {
+	width: 100%;
+  }
+
+  // Push and pull columns for source order changes
+  .col-sm-push-1 {
+	left: percentage((1 / @grid-columns));
+  }
+
+  .col-sm-push-2 {
+	left: percentage((2 / @grid-columns));
+  }
+
+  .col-sm-push-3 {
+	left: percentage((3 / @grid-columns));
+  }
+
+  .col-sm-push-4 {
+	left: percentage((4 / @grid-columns));
+  }
+
+  .col-sm-push-5 {
+	left: percentage((5 / @grid-columns));
+  }
+
+  .col-sm-push-6 {
+	left: percentage((6 / @grid-columns));
+  }
+
+  .col-sm-push-7 {
+	left: percentage((7 / @grid-columns));
+  }
+
+  .col-sm-push-8 {
+	left: percentage((8 / @grid-columns));
+  }
+
+  .col-sm-push-9 {
+	left: percentage((9 / @grid-columns));
+  }
+
+  .col-sm-push-10 {
+	left: percentage((10/ @grid-columns));
+  }
+
+  .col-sm-push-11 {
+	left: percentage((11/ @grid-columns));
+  }
+
+  .col-sm-pull-1 {
+	right: percentage((1 / @grid-columns));
+  }
+
+  .col-sm-pull-2 {
+	right: percentage((2 / @grid-columns));
+  }
+
+  .col-sm-pull-3 {
+	right: percentage((3 / @grid-columns));
+  }
+
+  .col-sm-pull-4 {
+	right: percentage((4 / @grid-columns));
+  }
+
+  .col-sm-pull-5 {
+	right: percentage((5 / @grid-columns));
+  }
+
+  .col-sm-pull-6 {
+	right: percentage((6 / @grid-columns));
+  }
+
+  .col-sm-pull-7 {
+	right: percentage((7 / @grid-columns));
+  }
+
+  .col-sm-pull-8 {
+	right: percentage((8 / @grid-columns));
+  }
+
+  .col-sm-pull-9 {
+	right: percentage((9 / @grid-columns));
+  }
+
+  .col-sm-pull-10 {
+	right: percentage((10/ @grid-columns));
+  }
+
+  .col-sm-pull-11 {
+	right: percentage((11/ @grid-columns));
+  }
+
+  // Offsets
+  .col-sm-offset-1 {
+	margin-left: percentage((1 / @grid-columns));
+  }
+
+  .col-sm-offset-2 {
+	margin-left: percentage((2 / @grid-columns));
+  }
+
+  .col-sm-offset-3 {
+	margin-left: percentage((3 / @grid-columns));
+  }
+
+  .col-sm-offset-4 {
+	margin-left: percentage((4 / @grid-columns));
+  }
+
+  .col-sm-offset-5 {
+	margin-left: percentage((5 / @grid-columns));
+  }
+
+  .col-sm-offset-6 {
+	margin-left: percentage((6 / @grid-columns));
+  }
+
+  .col-sm-offset-7 {
+	margin-left: percentage((7 / @grid-columns));
+  }
+
+  .col-sm-offset-8 {
+	margin-left: percentage((8 / @grid-columns));
+  }
+
+  .col-sm-offset-9 {
+	margin-left: percentage((9 / @grid-columns));
+  }
+
+  .col-sm-offset-10 {
+	margin-left: percentage((10/ @grid-columns));
+  }
+
+  .col-sm-offset-11 {
+	margin-left: percentage((11/ @grid-columns));
+  }
+}
 
 // Medium grid
 //
@@ -196,6 +360,7 @@
   .container {
 	width: @container-md;
   }
+
   .col-md-1,
   .col-md-2,
   .col-md-3,
@@ -209,61 +374,201 @@
   .col-md-11 {
 	float: left;
   }
-  .col-md-1  { width: percentage((1 / @grid-columns)); }
-  .col-md-2  { width: percentage((2 / @grid-columns)); }
-  .col-md-3  { width: percentage((3 / @grid-columns)); }
-  .col-md-4  { width: percentage((4 / @grid-columns)); }
-  .col-md-5  { width: percentage((5 / @grid-columns)); }
-  .col-md-6  { width: percentage((6 / @grid-columns)); }
-  .col-md-7  { width: percentage((7 / @grid-columns)); }
-  .col-md-8  { width: percentage((8 / @grid-columns)); }
-  .col-md-9  { width: percentage((9 / @grid-columns)); }
-  .col-md-10 { width: percentage((10/ @grid-columns)); }
-  .col-md-11 { width: percentage((11/ @grid-columns)); }
-  .col-md-12 { width: 100%; }
 
-  // Push and pull columns for source order changes
+  .col-md-1 {
-  .col-md-push-0  { left: auto; }
+	width: percentage((1 / @grid-columns));
-  .col-md-push-1  { left: percentage((1 / @grid-columns)); }
-  .col-md-push-2  { left: percentage((2 / @grid-columns)); }
-  .col-md-push-3  { left: percentage((3 / @grid-columns)); }
-  .col-md-push-4  { left: percentage((4 / @grid-columns)); }
-  .col-md-push-5  { left: percentage((5 / @grid-columns)); }
-  .col-md-push-6  { left: percentage((6 / @grid-columns)); }
-  .col-md-push-7  { left: percentage((7 / @grid-columns)); }
-  .col-md-push-8  { left: percentage((8 / @grid-columns)); }
-  .col-md-push-9  { left: percentage((9 / @grid-columns)); }
-  .col-md-push-10 { left: percentage((10/ @grid-columns)); }
-  .col-md-push-11 { left: percentage((11/ @grid-columns)); }
-
-  .col-md-pull-0  { right: auto; }
-  .col-md-pull-1  { right: percentage((1 / @grid-columns)); }
-  .col-md-pull-2  { right: percentage((2 / @grid-columns)); }
-  .col-md-pull-3  { right: percentage((3 / @grid-columns)); }
-  .col-md-pull-4  { right: percentage((4 / @grid-columns)); }
-  .col-md-pull-5  { right: percentage((5 / @grid-columns)); }
-  .col-md-pull-6  { right: percentage((6 / @grid-columns)); }
-  .col-md-pull-7  { right: percentage((7 / @grid-columns)); }
-  .col-md-pull-8  { right: percentage((8 / @grid-columns)); }
-  .col-md-pull-9  { right: percentage((9 / @grid-columns)); }
-  .col-md-pull-10 { right: percentage((10/ @grid-columns)); }
-  .col-md-pull-11 { right: percentage((11/ @grid-columns)); }
-
-  // Offsets
-  .col-md-offset-0  { margin-left: 0; }
-  .col-md-offset-1  { margin-left: percentage((1 / @grid-columns)); }
-  .col-md-offset-2  { margin-left: percentage((2 / @grid-columns)); }
-  .col-md-offset-3  { margin-left: percentage((3 / @grid-columns)); }
-  .col-md-offset-4  { margin-left: percentage((4 / @grid-columns)); }
-  .col-md-offset-5  { margin-left: percentage((5 / @grid-columns)); }
-  .col-md-offset-6  { margin-left: percentage((6 / @grid-columns)); }
-  .col-md-offset-7  { margin-left: percentage((7 / @grid-columns)); }
-  .col-md-offset-8  { margin-left: percentage((8 / @grid-columns)); }
-  .col-md-offset-9  { margin-left: percentage((9 / @grid-columns)); }
-  .col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); }
-  .col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); }
   }
 
+  .col-md-2 {
+	width: percentage((2 / @grid-columns));
+  }
+
+  .col-md-3 {
+	width: percentage((3 / @grid-columns));
+  }
+
+  .col-md-4 {
+	width: percentage((4 / @grid-columns));
+  }
+
+  .col-md-5 {
+	width: percentage((5 / @grid-columns));
+  }
+
+  .col-md-6 {
+	width: percentage((6 / @grid-columns));
+  }
+
+  .col-md-7 {
+	width: percentage((7 / @grid-columns));
+  }
+
+  .col-md-8 {
+	width: percentage((8 / @grid-columns));
+  }
+
+  .col-md-9 {
+	width: percentage((9 / @grid-columns));
+  }
+
+  .col-md-10 {
+	width: percentage((10/ @grid-columns));
+  }
+
+  .col-md-11 {
+	width: percentage((11/ @grid-columns));
+  }
+
+  .col-md-12 {
+	width: 100%;
+  }
+
+  // Push and pull columns for source order changes
+  .col-md-push-0 {
+	left: auto;
+  }
+
+  .col-md-push-1 {
+	left: percentage((1 / @grid-columns));
+  }
+
+  .col-md-push-2 {
+	left: percentage((2 / @grid-columns));
+  }
+
+  .col-md-push-3 {
+	left: percentage((3 / @grid-columns));
+  }
+
+  .col-md-push-4 {
+	left: percentage((4 / @grid-columns));
+  }
+
+  .col-md-push-5 {
+	left: percentage((5 / @grid-columns));
+  }
+
+  .col-md-push-6 {
+	left: percentage((6 / @grid-columns));
+  }
+
+  .col-md-push-7 {
+	left: percentage((7 / @grid-columns));
+  }
+
+  .col-md-push-8 {
+	left: percentage((8 / @grid-columns));
+  }
+
+  .col-md-push-9 {
+	left: percentage((9 / @grid-columns));
+  }
+
+  .col-md-push-10 {
+	left: percentage((10/ @grid-columns));
+  }
+
+  .col-md-push-11 {
+	left: percentage((11/ @grid-columns));
+  }
+
+  .col-md-pull-0 {
+	right: auto;
+  }
+
+  .col-md-pull-1 {
+	right: percentage((1 / @grid-columns));
+  }
+
+  .col-md-pull-2 {
+	right: percentage((2 / @grid-columns));
+  }
+
+  .col-md-pull-3 {
+	right: percentage((3 / @grid-columns));
+  }
+
+  .col-md-pull-4 {
+	right: percentage((4 / @grid-columns));
+  }
+
+  .col-md-pull-5 {
+	right: percentage((5 / @grid-columns));
+  }
+
+  .col-md-pull-6 {
+	right: percentage((6 / @grid-columns));
+  }
+
+  .col-md-pull-7 {
+	right: percentage((7 / @grid-columns));
+  }
+
+  .col-md-pull-8 {
+	right: percentage((8 / @grid-columns));
+  }
+
+  .col-md-pull-9 {
+	right: percentage((9 / @grid-columns));
+  }
+
+  .col-md-pull-10 {
+	right: percentage((10/ @grid-columns));
+  }
+
+  .col-md-pull-11 {
+	right: percentage((11/ @grid-columns));
+  }
+
+  // Offsets
+  .col-md-offset-0 {
+	margin-left: 0;
+  }
+
+  .col-md-offset-1 {
+	margin-left: percentage((1 / @grid-columns));
+  }
+
+  .col-md-offset-2 {
+	margin-left: percentage((2 / @grid-columns));
+  }
+
+  .col-md-offset-3 {
+	margin-left: percentage((3 / @grid-columns));
+  }
+
+  .col-md-offset-4 {
+	margin-left: percentage((4 / @grid-columns));
+  }
+
+  .col-md-offset-5 {
+	margin-left: percentage((5 / @grid-columns));
+  }
+
+  .col-md-offset-6 {
+	margin-left: percentage((6 / @grid-columns));
+  }
+
+  .col-md-offset-7 {
+	margin-left: percentage((7 / @grid-columns));
+  }
+
+  .col-md-offset-8 {
+	margin-left: percentage((8 / @grid-columns));
+  }
+
+  .col-md-offset-9 {
+	margin-left: percentage((9 / @grid-columns));
+  }
+
+  .col-md-offset-10 {
+	margin-left: percentage((10/ @grid-columns));
+  }
+
+  .col-md-offset-11 {
+	margin-left: percentage((11/ @grid-columns));
+  }
+}
 
 // Large grid
 //
@@ -290,57 +595,198 @@
   .col-lg-11 {
 	float: left;
   }
-  .col-lg-1  { width: percentage((1 / @grid-columns)); }
+
-  .col-lg-2  { width: percentage((2 / @grid-columns)); }
+  .col-lg-1 {
-  .col-lg-3  { width: percentage((3 / @grid-columns)); }
+	width: percentage((1 / @grid-columns));
-  .col-lg-4  { width: percentage((4 / @grid-columns)); }
+  }
-  .col-lg-5  { width: percentage((5 / @grid-columns)); }
+
-  .col-lg-6  { width: percentage((6 / @grid-columns)); }
+  .col-lg-2 {
-  .col-lg-7  { width: percentage((7 / @grid-columns)); }
+	width: percentage((2 / @grid-columns));
-  .col-lg-8  { width: percentage((8 / @grid-columns)); }
+  }
-  .col-lg-9  { width: percentage((9 / @grid-columns)); }
+
-  .col-lg-10 { width: percentage((10/ @grid-columns)); }
+  .col-lg-3 {
-  .col-lg-11 { width: percentage((11/ @grid-columns)); }
+	width: percentage((3 / @grid-columns));
-  .col-lg-12 { width: 100%; }
+  }
+
+  .col-lg-4 {
+	width: percentage((4 / @grid-columns));
+  }
+
+  .col-lg-5 {
+	width: percentage((5 / @grid-columns));
+  }
+
+  .col-lg-6 {
+	width: percentage((6 / @grid-columns));
+  }
+
+  .col-lg-7 {
+	width: percentage((7 / @grid-columns));
+  }
+
+  .col-lg-8 {
+	width: percentage((8 / @grid-columns));
+  }
+
+  .col-lg-9 {
+	width: percentage((9 / @grid-columns));
+  }
+
+  .col-lg-10 {
+	width: percentage((10/ @grid-columns));
+  }
+
+  .col-lg-11 {
+	width: percentage((11/ @grid-columns));
+  }
+
+  .col-lg-12 {
+	width: 100%;
+  }
 
   // Push and pull columns for source order changes
-  .col-lg-push-0  { left: auto; }
+  .col-lg-push-0 {
-  .col-lg-push-1  { left: percentage((1 / @grid-columns)); }
+	left: auto;
-  .col-lg-push-2  { left: percentage((2 / @grid-columns)); }
+  }
-  .col-lg-push-3  { left: percentage((3 / @grid-columns)); }
-  .col-lg-push-4  { left: percentage((4 / @grid-columns)); }
-  .col-lg-push-5  { left: percentage((5 / @grid-columns)); }
-  .col-lg-push-6  { left: percentage((6 / @grid-columns)); }
-  .col-lg-push-7  { left: percentage((7 / @grid-columns)); }
-  .col-lg-push-8  { left: percentage((8 / @grid-columns)); }
-  .col-lg-push-9  { left: percentage((9 / @grid-columns)); }
-  .col-lg-push-10 { left: percentage((10/ @grid-columns)); }
-  .col-lg-push-11 { left: percentage((11/ @grid-columns)); }
 
-  .col-lg-pull-0  { right: auto; }
+  .col-lg-push-1 {
-  .col-lg-pull-1  { right: percentage((1 / @grid-columns)); }
+	left: percentage((1 / @grid-columns));
-  .col-lg-pull-2  { right: percentage((2 / @grid-columns)); }
+  }
-  .col-lg-pull-3  { right: percentage((3 / @grid-columns)); }
+
-  .col-lg-pull-4  { right: percentage((4 / @grid-columns)); }
+  .col-lg-push-2 {
-  .col-lg-pull-5  { right: percentage((5 / @grid-columns)); }
+	left: percentage((2 / @grid-columns));
-  .col-lg-pull-6  { right: percentage((6 / @grid-columns)); }
+  }
-  .col-lg-pull-7  { right: percentage((7 / @grid-columns)); }
+
-  .col-lg-pull-8  { right: percentage((8 / @grid-columns)); }
+  .col-lg-push-3 {
-  .col-lg-pull-9  { right: percentage((9 / @grid-columns)); }
+	left: percentage((3 / @grid-columns));
-  .col-lg-pull-10 { right: percentage((10/ @grid-columns)); }
+  }
-  .col-lg-pull-11 { right: percentage((11/ @grid-columns)); }
+
+  .col-lg-push-4 {
+	left: percentage((4 / @grid-columns));
+  }
+
+  .col-lg-push-5 {
+	left: percentage((5 / @grid-columns));
+  }
+
+  .col-lg-push-6 {
+	left: percentage((6 / @grid-columns));
+  }
+
+  .col-lg-push-7 {
+	left: percentage((7 / @grid-columns));
+  }
+
+  .col-lg-push-8 {
+	left: percentage((8 / @grid-columns));
+  }
+
+  .col-lg-push-9 {
+	left: percentage((9 / @grid-columns));
+  }
+
+  .col-lg-push-10 {
+	left: percentage((10/ @grid-columns));
+  }
+
+  .col-lg-push-11 {
+	left: percentage((11/ @grid-columns));
+  }
+
+  .col-lg-pull-0 {
+	right: auto;
+  }
+
+  .col-lg-pull-1 {
+	right: percentage((1 / @grid-columns));
+  }
+
+  .col-lg-pull-2 {
+	right: percentage((2 / @grid-columns));
+  }
+
+  .col-lg-pull-3 {
+	right: percentage((3 / @grid-columns));
+  }
+
+  .col-lg-pull-4 {
+	right: percentage((4 / @grid-columns));
+  }
+
+  .col-lg-pull-5 {
+	right: percentage((5 / @grid-columns));
+  }
+
+  .col-lg-pull-6 {
+	right: percentage((6 / @grid-columns));
+  }
+
+  .col-lg-pull-7 {
+	right: percentage((7 / @grid-columns));
+  }
+
+  .col-lg-pull-8 {
+	right: percentage((8 / @grid-columns));
+  }
+
+  .col-lg-pull-9 {
+	right: percentage((9 / @grid-columns));
+  }
+
+  .col-lg-pull-10 {
+	right: percentage((10/ @grid-columns));
+  }
+
+  .col-lg-pull-11 {
+	right: percentage((11/ @grid-columns));
+  }
 
   // Offsets
-  .col-lg-offset-0  { margin-left: 0; }
+  .col-lg-offset-0 {
-  .col-lg-offset-1  { margin-left: percentage((1 / @grid-columns)); }
+	margin-left: 0;
-  .col-lg-offset-2  { margin-left: percentage((2 / @grid-columns)); }
+  }
-  .col-lg-offset-3  { margin-left: percentage((3 / @grid-columns)); }
+
-  .col-lg-offset-4  { margin-left: percentage((4 / @grid-columns)); }
+  .col-lg-offset-1 {
-  .col-lg-offset-5  { margin-left: percentage((5 / @grid-columns)); }
+	margin-left: percentage((1 / @grid-columns));
-  .col-lg-offset-6  { margin-left: percentage((6 / @grid-columns)); }
+  }
-  .col-lg-offset-7  { margin-left: percentage((7 / @grid-columns)); }
+
-  .col-lg-offset-8  { margin-left: percentage((8 / @grid-columns)); }
+  .col-lg-offset-2 {
-  .col-lg-offset-9  { margin-left: percentage((9 / @grid-columns)); }
+	margin-left: percentage((2 / @grid-columns));
-  .col-lg-offset-10 { margin-left: percentage((10/ @grid-columns)); }
+  }
-  .col-lg-offset-11 { margin-left: percentage((11/ @grid-columns)); }
+
+  .col-lg-offset-3 {
+	margin-left: percentage((3 / @grid-columns));
+  }
+
+  .col-lg-offset-4 {
+	margin-left: percentage((4 / @grid-columns));
+  }
+
+  .col-lg-offset-5 {
+	margin-left: percentage((5 / @grid-columns));
+  }
+
+  .col-lg-offset-6 {
+	margin-left: percentage((6 / @grid-columns));
+  }
+
+  .col-lg-offset-7 {
+	margin-left: percentage((7 / @grid-columns));
+  }
+
+  .col-lg-offset-8 {
+	margin-left: percentage((8 / @grid-columns));
+  }
+
+  .col-lg-offset-9 {
+	margin-left: percentage((9 / @grid-columns));
+  }
+
+  .col-lg-offset-10 {
+	margin-left: percentage((10/ @grid-columns));
+  }
+
+  .col-lg-offset-11 {
+	margin-left: percentage((11/ @grid-columns));
+  }
 }

public/less/ie8and.less

@@ -3,15 +3,17 @@
 // Amend the width of container if you want to here
 @container-md-ie8: @container-md;
 
-@grid-adjustment: percentage(@grid-gutter-width / @container-md-ie8);
+@grid-adjustment: percentage((@grid-gutter-width / @container-md-ie8));
 
 .ie7, .ie8 {
   * {
 	box-sizing: content-box;
   }
+
   .clearfix {
 	*zoom: 1;
   }
+
   ul, ol {
 	margin-left: 0;
   }
@@ -33,59 +35,167 @@
   .col-md-11 {
 	float: left;
   }
-	.col-md-1  { width: percentage((1 / @grid-columns)) - @grid-adjustment; }
+
-	.col-md-2  { width: percentage((2 / @grid-columns)) - @grid-adjustment; }
+  .col-md-1 {
-	.col-md-3  { width: percentage((3 / @grid-columns)) - @grid-adjustment; }
+	width: percentage((1 / @grid-columns)) - @grid-adjustment;
-	.col-md-4  { width: percentage((4 / @grid-columns)) - @grid-adjustment; }
+  }
-	.col-md-5  { width: percentage((5 / @grid-columns)) - @grid-adjustment; }
+
-	.col-md-6  { width: percentage((6 / @grid-columns)) - @grid-adjustment; }
+  .col-md-2 {
-	.col-md-7  { width: percentage((7 / @grid-columns)) - @grid-adjustment; }
+	width: percentage((2 / @grid-columns)) - @grid-adjustment;
-	.col-md-8  { width: percentage((8 / @grid-columns)) - @grid-adjustment; }
+  }
-	.col-md-9  { width: percentage((9 / @grid-columns)) - @grid-adjustment; }
+
-	.col-md-10 { width: percentage((10/ @grid-columns)) - @grid-adjustment; }
+  .col-md-3 {
-	.col-md-11 { width: percentage((11/ @grid-columns)) - @grid-adjustment; }
+	width: percentage((3 / @grid-columns)) - @grid-adjustment;
-	.col-md-12 { width: 100% - @grid-adjustment; }
+  }
+
+  .col-md-4 {
+	width: percentage((4 / @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-5 {
+	width: percentage((5 / @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-6 {
+	width: percentage((6 / @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-7 {
+	width: percentage((7 / @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-8 {
+	width: percentage((8 / @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-9 {
+	width: percentage((9 / @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-10 {
+	width: percentage((10/ @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-11 {
+	width: percentage((11/ @grid-columns)) - @grid-adjustment;
+  }
+
+  .col-md-12 {
+	width: 100% - @grid-adjustment;
+  }
 
   // Push and pull columns for source order changes
-	.col-md-push-0  { left: auto; }
+  .col-md-push-0 {
-	.col-md-push-1  { left: percentage((1 / @grid-columns)); }
+	left: auto;
-	.col-md-push-2  { left: percentage((2 / @grid-columns)); }
+  }
-	.col-md-push-3  { left: percentage((3 / @grid-columns)); }
+  .col-md-push-1 {
-	.col-md-push-4  { left: percentage((4 / @grid-columns)); }
+	left: percentage((1 / @grid-columns));
-	.col-md-push-5  { left: percentage((5 / @grid-columns)); }
+  }
-	.col-md-push-6  { left: percentage((6 / @grid-columns)); }
+  .col-md-push-2 {
-	.col-md-push-7  { left: percentage((7 / @grid-columns)); }
+	left: percentage((2 / @grid-columns));
-	.col-md-push-8  { left: percentage((8 / @grid-columns)); }
+  }
-	.col-md-push-9  { left: percentage((9 / @grid-columns)); }
+  .col-md-push-3 {
-	.col-md-push-10 { left: percentage((10/ @grid-columns)); }
+	left: percentage((3 / @grid-columns));
-	.col-md-push-11 { left: percentage((11/ @grid-columns)); }
+  }
+  .col-md-push-4 {
+	left: percentage((4 / @grid-columns));
+  }
+  .col-md-push-5 {
+	left: percentage((5 / @grid-columns));
+  }
+  .col-md-push-6 {
+	left: percentage((6 / @grid-columns));
+  }
+  .col-md-push-7 {
+	left: percentage((7 / @grid-columns));
+  }
+  .col-md-push-8 {
+	left: percentage((8 / @grid-columns));
+  }
+  .col-md-push-9 {
+	left: percentage((9 / @grid-columns));
+  }
+  .col-md-push-10 {
+	left: percentage((10/ @grid-columns));
+  }
+  .col-md-push-11 {
+	left: percentage((11/ @grid-columns));
+  }
 
-	.col-md-pull-0  { right: auto; }
+  .col-md-pull-0 {
-	.col-md-pull-1  { right: percentage((1 / @grid-columns)); }
+	right: auto;
-	.col-md-pull-2  { right: percentage((2 / @grid-columns)); }
+  }
-	.col-md-pull-3  { right: percentage((3 / @grid-columns)); }
+  .col-md-pull-1 {
-	.col-md-pull-4  { right: percentage((4 / @grid-columns)); }
+	right: percentage((1 / @grid-columns));
-	.col-md-pull-5  { right: percentage((5 / @grid-columns)); }
+  }
-	.col-md-pull-6  { right: percentage((6 / @grid-columns)); }
+  .col-md-pull-2 {
-	.col-md-pull-7  { right: percentage((7 / @grid-columns)); }
+	right: percentage((2 / @grid-columns));
-	.col-md-pull-8  { right: percentage((8 / @grid-columns)); }
+  }
-	.col-md-pull-9  { right: percentage((9 / @grid-columns)); }
+  .col-md-pull-3 {
-	.col-md-pull-10 { right: percentage((10/ @grid-columns)); }
+	right: percentage((3 / @grid-columns));
-	.col-md-pull-11 { right: percentage((11/ @grid-columns)); }
+  }
+  .col-md-pull-4 {
+	right: percentage((4 / @grid-columns));
+  }
+  .col-md-pull-5 {
+	right: percentage((5 / @grid-columns));
+  }
+  .col-md-pull-6 {
+	right: percentage((6 / @grid-columns));
+  }
+  .col-md-pull-7 {
+	right: percentage((7 / @grid-columns));
+  }
+  .col-md-pull-8 {
+	right: percentage((8 / @grid-columns));
+  }
+  .col-md-pull-9 {
+	right: percentage((9 / @grid-columns));
+  }
+  .col-md-pull-10 {
+	right: percentage((10/ @grid-columns));
+  }
+  .col-md-pull-11 {
+	right: percentage((11/ @grid-columns));
+  }
 
   // Offsets
-	.col-md-offset-0  { margin-left: 0; }
+  .col-md-offset-0 {
-	.col-md-offset-1  { margin-left: percentage((1 / @grid-columns)); }
+	margin-left: 0;
-	.col-md-offset-2  { margin-left: percentage((2 / @grid-columns)); }
+  }
-	.col-md-offset-3  { margin-left: percentage((3 / @grid-columns)); }
+  .col-md-offset-1 {
-	.col-md-offset-4  { margin-left: percentage((4 / @grid-columns)); }
+	margin-left: percentage((1 / @grid-columns));
-	.col-md-offset-5  { margin-left: percentage((5 / @grid-columns)); }
+  }
-	.col-md-offset-6  { margin-left: percentage((6 / @grid-columns)); }
+  .col-md-offset-2 {
-	.col-md-offset-7  { margin-left: percentage((7 / @grid-columns)); }
+	margin-left: percentage((2 / @grid-columns));
-	.col-md-offset-8  { margin-left: percentage((8 / @grid-columns)); }
+  }
-	.col-md-offset-9  { margin-left: percentage((9 / @grid-columns)); }
+  .col-md-offset-3 {
-	.col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); }
+	margin-left: percentage((3 / @grid-columns));
-	.col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); }
+  }
+  .col-md-offset-4 {
+	margin-left: percentage((4 / @grid-columns));
+  }
+  .col-md-offset-5 {
+	margin-left: percentage((5 / @grid-columns));
+  }
+  .col-md-offset-6 {
+	margin-left: percentage((6 / @grid-columns));
+  }
+  .col-md-offset-7 {
+	margin-left: percentage((7 / @grid-columns));
+  }
+  .col-md-offset-8 {
+	margin-left: percentage((8 / @grid-columns));
+  }
+  .col-md-offset-9 {
+	margin-left: percentage((9 / @grid-columns));
+  }
+  .col-md-offset-10 {
+	margin-left: percentage((10/ @grid-columns));
+  }
+  .col-md-offset-11 {
+	margin-left: percentage((11/ @grid-columns));
+  }
 
   .clearfix {
 	*zoom: 1;

public/less/input-groups.less

@@ -29,11 +29,15 @@
 
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
-.input-group-lg > .input-group-btn > .btn { .input-lg(); }
+.input-group-lg > .input-group-btn > .btn {
+  .input-lg();
+}
+
 .input-group-sm > .form-control,
 .input-group-sm > .input-group-addon,
-.input-group-sm > .input-group-btn > .btn { .input-sm(); }
+.input-group-sm > .input-group-btn > .btn {
-
+  .input-sm();
+}
 
 // Display as table-cell
 // -------------------------
@@ -46,6 +50,7 @@
 	border-radius: 0;
   }
 }
+
 // Addon and addon wrapper for buttons
 .input-group-addon,
 .input-group-btn {
@@ -94,9 +99,11 @@
 .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
   .border-right-radius(0);
 }
+
 .input-group-addon:first-child {
   border-right: 0;
 }
+
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
@@ -104,6 +111,7 @@
 .input-group-btn:first-child > .btn:not(:first-child) {
   .border-left-radius(0);
 }
+
 .input-group-addon:last-child {
   border-left: 0;
 }
@@ -122,6 +130,7 @@
 	margin-left: -1px;
   }
 }
+
 .input-group-btn > .btn {
   position: relative;
   // Jankily prevent input button groups from wrapping

public/less/jumbotron.less

@@ -2,7 +2,6 @@
 // Jumbotron
 // --------------------------------------------------
 
-
 .jumbotron {
   padding: @jumbotron-padding;
   margin-bottom: @jumbotron-padding;
@@ -16,6 +15,7 @@
 	line-height: 1;
 	color: @jumbotron-heading-color;
   }
+
   p {
 	line-height: 1.4;
   }

public/less/list-group.less

@@ -82,6 +82,7 @@
   margin-top: 0;
   margin-bottom: 5px;
 }
+
 .list-group-item-text {
   margin-bottom: 0;
   line-height: 1.3;

public/less/main.less

@@ -1,12 +1,11 @@
 // Core variables and mixins
 @import "variables.less";
-@import "variables-flatly.less"; /* Bootswatch Flatly theme variables */
+@import "variables-flatly.less";
+/* Bootswatch Flatly theme variables */
 @import "mixins.less";
-
 // Reset
 @import "normalize.less";
 @import "print.less";
-
 // Core CSS
 @import "scaffolding.less";
 @import "type.less";
@@ -15,7 +14,6 @@
 @import "tables.less";
 @import "forms.less";
 @import "buttons.less";
-
 // Components
 @import "component-animations.less";
 @import "glyphicons.less";
@@ -38,25 +36,20 @@
 @import "panels.less";
 @import "wells.less";
 @import "close.less";
-
 // Components w/ JavaScript
 //@import "modals.less";
 @import "tooltip.less";
-//@import "popovers.less";
+@import "popovers.less";
 //@import "carousel.less";
-
 // Utility classes
 @import "utilities.less";
 @import "responsive-utilities.less";
-
 //Bootswatch overrides
 @import "bootswatch.less";
-
 // Site specific
 @import "site.less";
 @import "site-nojavascript.less";
 @import "site-responsive.less";
-
 // Stupid ie
 @import "ie8and.less";
 @import "site-ie8and.less";

public/less/media.less

@@ -2,7 +2,6 @@
 // Source: http://stubbornella.org/content/?p=497
 // --------------------------------------------------
 
-
 // Common styles
 // -------------------------
 
@@ -18,6 +17,7 @@
 .media .media {
   margin-top: 15px;
 }
+
 .media:first-child {
   margin-top: 0;
 }
@@ -32,7 +32,6 @@
   margin: 0 0 5px;
 }
 
-
 // Media image alignment
 // -------------------------
 
@@ -45,7 +44,6 @@
   }
 }
 
-
 // Media list variation
 // -------------------------
 

public/less/mixins.less

@@ -2,7 +2,6 @@
 // Mixins
 // --------------------------------------------------
 
-
 // Utilities
 // -------------------------
 
@@ -48,16 +47,29 @@
   width: @width;
   height: @height;
 }
+
 .square(@size) {
   .size(@size; @size);
 }
 
 // Placeholder text
 .placeholder(@color: @input-color-placeholder) {
-  &:-moz-placeholder            { color: @color; } // Firefox 4-18
+  &:-moz-placeholder {
-  &::-moz-placeholder           { color: @color; } // Firefox 19+
+	color: @color;
-  &:-ms-input-placeholder       { color: @color; } // Internet Explorer 10+
+  }
-  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome
+  // Firefox 4-18
+  &::-moz-placeholder {
+	color: @color;
+  }
+  // Firefox 19+
+  &:-ms-input-placeholder {
+	color: @color;
+  }
+  // Internet Explorer 10+
+  &::-webkit-input-placeholder {
+	color: @color;
+  }
+  // Safari and Chrome
 }
 
 // Text overflow
@@ -85,6 +97,7 @@
   background-color: transparent;
   border: 0;
 }
+
 // New mixin to use as of v3.0.1
 .text-hide() {
   font: ~"0/0" a;
@@ -94,8 +107,6 @@
   border: 0;
 }
 
-
-
 // CSS3 PROPERTIES
 // --------------------------------------------------
 
@@ -104,14 +115,17 @@
   border-top-right-radius: @radius;
   border-top-left-radius: @radius;
 }
+
 .border-right-radius(@radius) {
   border-bottom-right-radius: @radius;
   border-top-right-radius: @radius;
 }
+
 .border-bottom-radius(@radius) {
   border-bottom-right-radius: @radius;
   border-bottom-left-radius: @radius;
 }
+
 .border-left-radius(@radius) {
   border-bottom-left-radius: @radius;
   border-top-left-radius: @radius;
@@ -128,18 +142,22 @@
   -webkit-transition: @transition;
   transition: @transition;
 }
+
 .transition-property(@transition-property) {
   -webkit-transition-property: @transition-property;
   transition-property: @transition-property;
 }
+
 .transition-delay(@transition-delay) {
   -webkit-transition-delay: @transition-delay;
   transition-delay: @transition-delay;
 }
+
 .transition-duration(@transition-duration) {
   -webkit-transition-duration: @transition-duration;
   transition-duration: @transition-duration;
 }
+
 .transition-transform(@transition) {
   -webkit-transition: -webkit-transform @transition;
   -moz-transition: -moz-transform @transition;
@@ -153,21 +171,25 @@
   -ms-transform: rotate(@degrees); // IE9+
   transform: rotate(@degrees);
 }
+
 .scale(@ratio) {
   -webkit-transform: scale(@ratio);
   -ms-transform: scale(@ratio); // IE9+
   transform: scale(@ratio);
 }
+
 .translate(@x; @y) {
   -webkit-transform: translate(@x, @y);
   -ms-transform: translate(@x, @y); // IE9+
   transform: translate(@x, @y);
 }
+
 .skew(@x; @y) {
   -webkit-transform: skew(@x, @y);
   -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
   transform: skew(@x, @y);
 }
+
 .translate3d(@x; @y; @z) {
   -webkit-transform: translate3d(@x, @y, @z);
   transform: translate3d(@x, @y, @z);
@@ -178,28 +200,31 @@
   -ms-transform: rotateX(@degrees); // IE9+
   transform: rotateX(@degrees);
 }
+
 .rotateY(@degrees) {
   -webkit-transform: rotateY(@degrees);
   -ms-transform: rotateY(@degrees); // IE9+
   transform: rotateY(@degrees);
 }
+
 .perspective(@perspective) {
   -webkit-perspective: @perspective;
   -moz-perspective: @perspective;
   perspective: @perspective;
 }
+
 .perspective-origin(@perspective) {
   -webkit-perspective-origin: @perspective;
   -moz-perspective-origin: @perspective;
   perspective-origin: @perspective;
 }
+
 .transform-origin(@origin) {
   -webkit-transform-origin: @origin;
   -moz-transform-origin: @origin;
   transform-origin: @origin;
 }
 
-
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
 // Default value is `visible`, but can be changed to `hidden`
@@ -261,8 +286,6 @@
   filter: ~"alpha(opacity=@{opacity-ie})";
 }
 
-
-
 // GRADIENTS
 // --------------------------------------------------
 
@@ -339,8 +362,6 @@
   filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
 }
 
-
-
 // Retina images
 //
 // Short retina mixin for setting background-image and -size
@@ -348,19 +369,12 @@
 .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
   background-image: url("@{file-1x}");
 
-  @media
+  @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (   min--moz-device-pixel-ratio: 2), only screen and (     -o-min-device-pixel-ratio: 2/1), only screen and (        min-device-pixel-ratio: 2), only screen and (                min-resolution: 192dpi), only screen and (                min-resolution: 2dppx) {
-  only screen and (-webkit-min-device-pixel-ratio: 2),
-  only screen and (   min--moz-device-pixel-ratio: 2),
-  only screen and (     -o-min-device-pixel-ratio: 2/1),
-  only screen and (        min-device-pixel-ratio: 2),
-  only screen and (                min-resolution: 192dpi),
-  only screen and (                min-resolution: 2dppx) {
 	background-image: url("@{file-2x}");
 	background-size: @width-1x @height-1x;
   }
 }
 
-
 // Responsive image
 //
 // Keep images from scaling beyond the width of their parents.
@@ -371,7 +385,6 @@
   height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
 }
 
-
 // COMPONENT MIXINS
 // --------------------------------------------------
 
@@ -553,16 +566,22 @@
 // More easily include all the states for responsive-utilities.less.
 .responsive-visibility() {
   display: block !important;
-  tr& { display: table-row !important; }
+  tr& {
+	display: table-row !important;
+  }
   th&,
-  td& { display: table-cell !important; }
+  td& {
+	display: table-cell !important;
+  }
 }
 
 .responsive-invisibility() {
   &,
   tr&,
   th&,
-  td& { display: none !important; }
+  td& {
+	display: none !important;
+  }
 }
 
 // Grid System
@@ -618,11 +637,13 @@
 	margin-left: percentage((@columns / @grid-columns));
   }
 }
+
 .make-sm-column-push(@columns) {
   @media (min-width: @screen-sm-min) {
 	left: percentage((@columns / @grid-columns));
   }
 }
+
 .make-sm-column-pull(@columns) {
   @media (min-width: @screen-sm-min) {
 	right: percentage((@columns / @grid-columns));
@@ -651,11 +672,13 @@
 	margin-left: percentage((@columns / @grid-columns));
   }
 }
+
 .make-md-column-push(@columns) {
   @media (min-width: @screen-md) {
 	left: percentage((@columns / @grid-columns));
   }
 }
+
 .make-md-column-pull(@columns) {
   @media (min-width: @screen-md-min) {
 	right: percentage((@columns / @grid-columns));
@@ -684,18 +707,19 @@
 	margin-left: percentage((@columns / @grid-columns));
   }
 }
+
 .make-lg-column-push(@columns) {
   @media (min-width: @screen-lg-min) {
 	left: percentage((@columns / @grid-columns));
   }
 }
+
 .make-lg-column-pull(@columns) {
   @media (min-width: @screen-lg-min) {
 	right: percentage((@columns / @grid-columns));
   }
 }
 
-
 // Form validation states
 //
 // Used in forms.less to generate the form validation CSS for warnings, errors,

public/less/modals.less

@@ -11,7 +11,6 @@
 .modal-open {
   overflow: hidden;
 
-
   // Account for hiding of scrollbar
   body&,
   .navbar-fixed-top,
@@ -37,7 +36,9 @@
 	.translate(0, -25%);
 	.transition-transform(~"0.3s ease-out");
   }
-  &.in .modal-dialog { .translate(0, 0)}
+  &.in .modal-dialog {
+	.translate(0, 0)
+  }
 }
 
 // Shell div to position the modal with bottom padding
@@ -72,8 +73,12 @@
   z-index: (@zindex-modal-background - 10);
   background-color: @modal-backdrop-bg;
   // Fade for backdrop
-  &.fade { .opacity(0); }
+  &.fade {
-  &.in { .opacity(.5); }
+	.opacity(0);
+  }
+  &.in {
+	.opacity(.5);
+  }
 }
 
 // Modal header
@@ -83,6 +88,7 @@
   border-bottom: 1px solid @modal-header-border-color;
   min-height: (@modal-title-padding + @modal-title-line-height);
 }
+
 // Close icon
 .modal-header .close {
   margin-top: -2px;
@@ -126,14 +132,13 @@
 
 // Scale up the modal
 @media screen and (min-width: @screen-sm-min) {
-
   .modal-dialog {
 	width: 600px;
 	padding-top: 30px;
 	padding-bottom: 30px;
   }
+
   .modal-content {
 	.box-shadow(0 5px 15px rgba(0, 0, 0, .5));
   }
-
 }

public/less/navbar.less

@@ -2,7 +2,6 @@
 // Navbars
 // --------------------------------------------------
 
-
 // Wrapper and base class
 //
 // Provide a static navbar from which we expand to create full-width, fixed, and
@@ -23,7 +22,6 @@
   }
 }
 
-
 // Navbar heading
 //
 // Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy
@@ -37,7 +35,6 @@
   }
 }
 
-
 // Navbar collapse (body)
 //
 // Group your navbar content into this for easy collapsing and expanding across
@@ -82,16 +79,17 @@
 	.navbar-nav.navbar-left:first-child {
 	  margin-left: -@navbar-padding-horizontal;
 	}
+
 	.navbar-nav.navbar-right:last-child {
 	  margin-right: -@navbar-padding-horizontal;
 	}
+
 	.navbar-text:last-child {
 	  margin-right: 0;
 	}
   }
 }
 
-
 // Both navbar header and collapse
 //
 // When a container is present, change the behavior of the header and collapse.
@@ -107,7 +105,6 @@
   }
 }
 
-
 //
 // Navbar alignment options
 //
@@ -135,16 +132,17 @@
 	border-radius: 0;
   }
 }
+
 .navbar-fixed-top {
   z-index: @zindex-navbar-fixed;
   top: 0;
 }
+
 .navbar-fixed-bottom {
   bottom: 0;
   margin-bottom: 0; // override .navbar defaults
 }
 
-
 // Brand/project name
 
 .navbar-brand {
@@ -164,7 +162,6 @@
   }
 }
 
-
 // Navbar toggle
 //
 // Custom button for toggling the `.navbar-collapse`, powered by the collapse
@@ -196,7 +193,6 @@
   }
 }
 
-
 // Navbar nav links
 //
 // Builds on top of the `.nav` components with it's own modifier class to make
@@ -251,7 +247,6 @@
 
 }
 
-
 // Component alignment
 //
 // Repurpose the pull utilities as their own navbar utilities to avoid specifity
@@ -259,10 +254,14 @@
 // though so that navbar contents properly stack and align in mobile.
 
 @media (min-width: @grid-float-breakpoint) {
-  .navbar-left  { .pull-left(); }
+  .navbar-left {
-  .navbar-right { .pull-right(); }
+	.pull-left();
   }
 
+  .navbar-right {
+	.pull-right();
+  }
+}
 
 // Navbar form
 //
@@ -302,7 +301,6 @@
   }
 }
 
-
 // Dropdown menus
 
 // Menu position and menu carets
@@ -310,6 +308,7 @@
   margin-top: 0;
   .border-top-radius(0);
 }
+
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
   .border-bottom-radius(0);
@@ -322,7 +321,6 @@
   right: 0;
 }
 
-
 // Buttons in navbars
 //
 // Vertically center a button within a navbar (when *not* in a form).
@@ -331,7 +329,6 @@
   .navbar-vertical-align(@input-height-base);
 }
 
-
 // Text in navbars
 //
 // Add a class to make any element properly align itself vertically within the navbars.
@@ -438,7 +435,6 @@
 	  border-bottom-color: @navbar-default-link-color;
 	}
 
-
 	@media (max-width: @screen-xs-max) {
 	  // Dropdowns get custom display when collapsed
 	  .open .dropdown-menu {
@@ -470,7 +466,6 @@
 	}
   }
 
-
   // Links in navbars
   //
   // Add a class to ensure links outside the navbar nav are colored correctly.
@@ -617,5 +612,4 @@
 	  color: @navbar-inverse-link-hover-color;
 	}
   }
-
 }

public/less/navs.less

@@ -2,7 +2,6 @@
 // Navs
 // --------------------------------------------------
 
-
 // Base class
 // --------------------------------------------------
 
@@ -68,7 +67,6 @@
   }
 }
 
-
 // Tabs
 // -------------------------
 
@@ -111,7 +109,6 @@
   }
 }
 
-
 // Pills
 // -------------------------
 .nav-pills {
@@ -138,7 +135,6 @@
   }
 }
 
-
 // Stacked pills
 .nav-stacked {
   > li {
@@ -150,7 +146,6 @@
   }
 }
 
-
 // Nav variations
 // --------------------------------------------------
 
@@ -200,6 +195,7 @@
 	  border-bottom: 1px solid @nav-tabs-justified-link-border-color;
 	  border-radius: @border-radius-base @border-radius-base 0 0;
 	}
+
 	> .active > a,
 	> .active > a:hover,
 	> .active > a:focus {
@@ -208,7 +204,6 @@
   }
 }
 
-
 // Tabbable tabs
 // -------------------------
 
@@ -222,6 +217,7 @@
 .pill-content > .pill-pane {
   display: none;
 }
+
 .tab-content,
 .pill-content {
   > .active {
@@ -229,8 +225,6 @@
   }
 }
 
-
-
 // Dropdowns
 // -------------------------
 
@@ -239,6 +233,7 @@
   border-top-color: @link-color;
   border-bottom-color: @link-color;
 }
+
 .nav a:hover .caret {
   border-top-color: @link-hover-color;
   border-bottom-color: @link-hover-color;

public/less/pager.less

@@ -2,13 +2,13 @@
 // Pager pagination
 // --------------------------------------------------
 
-
 .pager {
   padding-left: 0;
   margin: @line-height-computed 0;
   list-style: none;
   text-align: center;
   .clearfix();
+
   li {
 	display: inline;
 	> a,
@@ -51,5 +51,4 @@
 	  cursor: not-allowed;
 	}
   }
-
 }

public/less/panels.less

@@ -2,7 +2,6 @@
 // Panels
 // --------------------------------------------------
 
-
 // Base class
 .panel {
   margin-bottom: @line-height-computed;
@@ -18,7 +17,6 @@
   .clearfix();
 }
 
-
 // List groups in panels
 //
 // By default, space out list group content from panel headings to account for
@@ -42,6 +40,7 @@
 	}
   }
 }
+
 // Collapse space between when there's no additional content.
 .panel-heading + .list-group {
   .list-group-item:first-child {
@@ -49,7 +48,6 @@
   }
 }
 
-
 // Tables in panels
 //
 // Place a non-bordered `.table` within a panel (not within a `.panel-body`) and
@@ -89,7 +87,6 @@
   }
 }
 
-
 // Optional heading
 .panel-heading {
   padding: 10px 15px;
@@ -115,7 +112,6 @@
   .border-bottom-radius(@panel-border-radius - 1);
 }
 
-
 // Collapsable panels (aka, accordion)
 //
 // Wrap a series of panels in `.panel-group` to turn them into an accordion with
@@ -146,23 +142,27 @@
   }
 }
 
-
 // Contextual variations
 .panel-default {
   .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);
 }
+
 .panel-primary {
   .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);
 }
+
 .panel-success {
   .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);
 }
+
 .panel-warning {
   .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);
 }
+
 .panel-danger {
   .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);
 }
+
 .panel-info {
   .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
 }

public/less/popovers.less

@@ -2,7 +2,6 @@
 // Popovers
 // --------------------------------------------------
 
-
 .popover {
   position: absolute;
   top: 0;
@@ -23,10 +22,18 @@
   white-space: normal;
 
   // Offset the popover to account for the popover arrow
-  &.top     { margin-top: -10px; }
+  &.top {
-  &.right   { margin-left: 10px; }
+	margin-top: -10px;
-  &.bottom  { margin-top: 10px; }
+  }
-  &.left    { margin-left: -10px; }
+  &.right {
+	margin-left: 10px;
+  }
+  &.bottom {
+	margin-top: 10px;
+  }
+  &.left {
+	margin-left: -10px;
+  }
 }
 
 .popover-title {
@@ -59,9 +66,11 @@
 	border-style: solid;
   }
 }
+
 .popover .arrow {
   border-width: @popover-arrow-outer-width;
 }
+
 .popover .arrow:after {
   border-width: @popover-arrow-width;
   content: "";
@@ -129,5 +138,4 @@
 	  bottom: -@popover-arrow-width;
 	}
   }
-
 }

public/less/print.less

@@ -71,18 +71,21 @@
   .navbar {
 	display: none;
   }
+
   .table {
 	td,
 	th {
 	  background-color: #fff !important;
 	}
   }
+
   .btn,
   .dropup > .btn {
 	> .caret {
 	  border-top-color: #000 !important;
 	}
   }
+
   .label {
 	border: 1px solid #000;
   }
@@ -90,6 +93,7 @@
   .table {
 	border-collapse: collapse !important;
   }
+
   .table-bordered {
 	th,
 	td {

public/less/progress-bars.less

@@ -2,35 +2,48 @@
 // Progress bars
 // --------------------------------------------------
 
-
 // Bar animations
 // -------------------------
 
 // Webkit
 @-webkit-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
+  from {
-  to    { background-position: 0 0; }
+	background-position: 40px 0;
+  }
+  to {
+	background-position: 0 0;
+  }
 }
 
 // Firefox
 @-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
+  from {
-  to    { background-position: 0 0; }
+	background-position: 40px 0;
+  }
+  to {
+	background-position: 0 0;
+  }
 }
 
 // Opera
 @-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
+  from {
-  to    { background-position: 40px 0; }
+	background-position: 0 0;
+  }
+  to {
+	background-position: 40px 0;
+  }
 }
 
 // Spec and IE10+
 @keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
+  from {
-  to    { background-position: 0 0; }
+	background-position: 40px 0;
+  }
+  to {
+	background-position: 0 0;
+  }
 }
-
-
 
 // Bar itself
 // -------------------------
@@ -74,8 +87,6 @@
   animation: progress-bar-stripes 2s linear infinite;
 }
 
-
-
 // Variations
 // -------------------------
 

public/less/responsive-utilities.less

@@ -2,7 +2,6 @@
 // Responsive: Utility classes
 // --------------------------------------------------
 
-
 // IE10 in Windows (Phone) 8
 //
 // Support for responsive views via media queries is kind of borked in IE10, for
@@ -21,7 +20,6 @@
   width: device-width;
 }
 
-
 // Hide from screenreaders and browsers
 //
 // Credit: HTML5 Boilerplate
@@ -31,7 +29,6 @@
   visibility: hidden !important;
 }
 
-
 // Visibility utilities
 
 .visible-xs {
@@ -55,6 +52,7 @@
 	}
   }
 }
+
 .visible-sm {
   .responsive-invisibility();
   &.visible-xs {
@@ -76,6 +74,7 @@
 	}
   }
 }
+
 .visible-md {
   .responsive-invisibility();
   &.visible-xs {
@@ -97,6 +96,7 @@
 	}
   }
 }
+
 .visible-lg {
   .responsive-invisibility();
   &.visible-xs {
@@ -140,6 +140,7 @@
 	}
   }
 }
+
 .hidden-sm {
   .responsive-visibility();
   &.hidden-xs {
@@ -161,6 +162,7 @@
 	}
   }
 }
+
 .hidden-md {
   .responsive-visibility();
   &.hidden-xs {
@@ -182,6 +184,7 @@
 	}
   }
 }
+
 .hidden-lg {
   .responsive-visibility();
   &.hidden-xs {
@@ -213,6 +216,7 @@
   .visible-print {
 	.responsive-visibility();
   }
+
   .hidden-print {
 	.responsive-invisibility();
   }

public/less/scaffolding.less

@@ -2,7 +2,6 @@
 // Scaffolding
 // --------------------------------------------------
 
-
 // Reset the box-sizing
 
 *,
@@ -11,7 +10,6 @@
   .box-sizing(border-box);
 }
 
-
 // Body reset
 
 html {
@@ -37,7 +35,6 @@ textarea {
   line-height: inherit;
 }
 
-
 // Links
 
 a {
@@ -55,7 +52,6 @@ a {
   }
 }
 
-
 // Images
 
 img {
@@ -92,7 +88,6 @@ img {
   border-radius: 50%; // set radius in percents
 }
 
-
 // Horizontal rules
 
 hr {
@@ -102,7 +97,6 @@ hr {
   border-top: 1px solid @hr-border;
 }
 
-
 // Only display content to screen readers
 //
 // See: http://a11yproject.com/posts/how-to-hide-content/

public/less/site-ie8and.less

@@ -25,33 +25,43 @@
 	border-bottom: 1px solid @legend-border-color;
 	margin-bottom: 20px;
   }
+
   .tooltip-inner {
-		background-color: #000000;
+	background-color: #000;
   }
+
   .date {
 	font-size: 85%;
   }
+
   .task-card-link {
 	min-height: 160px;
   }
+
   .series-checkboxes li {
 	margin-right: 1%;
   }
+
   .stat-type {
 	font-size: floor(@font-size-base * 0.65); // ~10px;
   }
+
   .aside .action-buttons .btn {
 	width: 79%;
   }
+
   .pull-right.dropdown-menu {
 	right: 134px;
   }
+
   .run-details .pull-right.dropdown-menu {
 	right: 64px;
   }
+
   .date-selector .btn-full-width {
 	width: 90%;
   }
+
   .filter-toggle {
 	&:before {
 	  height: 110%;
@@ -59,9 +69,11 @@
 	  left: 0;
 	  top: 0;
 	}
+
 	input {
 	  width: 92%;
 	}
+
 	.filter-trigger {
 	  padding-bottom: 0;
 	}
@@ -69,21 +81,21 @@
 }
 
 .ie7 {
-	.aside .task-stats li {
-		width:31.5%;
-	}
   .zfix {
 	position: relative;
 	z-index: 1001;
   }
+
   .list-group li .list-group-item {
 	margin: 0;
 	position: static;
   }
+
   .graph-spacer {
 	margin-bottom: 90px;
 	padding-bottom: 90px;
   }
+
   .date-selector {
 	zoom: 1;
 
@@ -91,24 +103,30 @@
 	  width: 100%;
 	}
   }
+
   .sr-only {
 	position: relative;
   }
+
   .breadcrumb li {
 	vertical-align: top;
 	zoom: 1;
 	display: inline;
 	margin-right: 10px;
   }
+
   .pull-right.dropdown-menu {
-		right:0px;
+	right: 0;
   }
+
   .run-details .pull-right.dropdown-menu {
 	right: 82px;
   }
+
   .tasks-list li {
 	padding-right: 105px;
   }
+
   .filter-toggle {
 	width: 30%;
 	margin: 0 35%;

public/less/site-nojavascript.less

@@ -18,29 +18,37 @@
   .graph-container, .expander {
 	display: none;
   }
+
   .hidden {
 	display: block !important;
 	visibility: visible !important;
   }
+
   .date-links.hidden {
 	display: none !important;
   }
+
   .btn-group:hover ul {
 	display: block !important;
   }
+
   table.hidden {
 	display: table !important;
   }
+
   .collapse {
 	display: block;
   }
+
   .heading {
 	margin-top: 0;
 	border-radius: 3px 3px 0 0;
   }
+
   .show-class {
 	display: block;
   }
+
   .no-js-hide {
 	display: none;
   }

public/less/site-responsive.less

@@ -18,47 +18,60 @@
   .h1, h1 {
 	font-size: floor(@font-size-base * 2.15); // ~32px;
   }
+
   .h2, h2 {
 	font-size: floor(@font-size-base * 1.9); // ~28px;
   }
+
   .task-header .h4 {
 	font-size: floor(@font-size-base * 1.15); // ~17px;
   }
+
   .header {
 	margin-bottom: 2rem;
 	padding-bottom: 1rem;
   }
+
   .task-header .btn {
 	padding: 5px 10px;
 	font-size: 12px;
 	line-height: 1.5rem;
   }
+
   .task-header h2 {
 	margin-bottom: 3px;
   }
+
   .date {
 	margin-top: 10px;
 	float: right;
   }
+
   .other-tasks {
 	.sr-only();
   }
+
   .task-stats,
   .btn-full-width {
 	margin-bottom: 0;
   }
+
   .task-card .task-stats {
 	margin-bottom: 10px;
   }
+
   .action-buttons {
 	margin-bottom: 20px;
   }
+
   .aside {
 	margin-bottom: 15px;
   }
+
   .graph-spacer {
 	padding-bottom: 80px;
   }
+
   .footer {
 	text-align: center;
 
@@ -71,20 +84,24 @@
 	}
   }
 }
+
 @media (max-width: 767px) {
   .date-selector {
 	margin-top: 0;
 	margin-bottom: 25px;
   }
+
   .readonly-mode .date {
 	margin-top: 0;
 	margin-bottom: 5px;
 	float: none;
   }
+
   .graph-spacer {
 	padding-bottom: 20px;
 	margin-bottom: 15px;
   }
+
   .action-buttons {
 	margin-top: 10px;
 	margin-bottom: 0;
@@ -93,43 +110,54 @@
 	  margin-bottom: 10px;
 	}
   }
+
   .task-header {
 	.run-details {
 	  text-align: left;
 	}
   }
+
   .task-card .task-card-link {
 	min-height: 0;
   }
 }
+
 @media (max-width: 640px) {
   body {
 	font-size: 14px;
   }
+
   .h1, h1 {
 	font-size: floor(@font-size-base * 1.75); // ~26px;
   }
+
   .h2, h2 {
 	font-size: floor(@font-size-base * 1.6); // ~24px;
   }
+
   .task-header .h4 {
 	font-size: floor(@font-size-base * 1.1); // ~16px;
   }
+
   .badge {
 	font-size: floor(@font-size-base * 0.75); // ~11px;
 	padding: 7px;
   }
+
   .rule-name .badge {
 	padding: 3px;
   }
+
   .graph {
 	margin-bottom: 3rem;
   }
+
   .delete-button {
 	font-size: floor(@font-size-base * 1.35); // ~20px;
 	top: 10px;
 	right: 25px;
   }
+
   .standards-lists {
 	.tooltip {
 	  &.top .tooltip-inner {
@@ -137,35 +165,42 @@
 	  }
 	}
   }
+
   .tasks-list {
-		li {
+	.panel {
 	  margin-bottom: 20px;
 	}
   }
+
   .footer .nav {
 	li {
 	  width: 50%;
 	}
   }
 }
+
 @media (max-width: 479px) {
   .graph {
 	height: 200px;
 	margin-bottom: 1.5rem;
   }
+
   .series-checkboxes li {
 	font-size: floor(@font-size-base * 0.8); // ~12px;
   }
+
   .task-header .h3 {
 	float: none !important;
 	text-align: center;
 	margin-bottom: 15px !important;
 	padding: 10px;
   }
+
   .task-header h1 {
 	margin-bottom: 3px;
   }
 }
+
 @media (max-width: 360px) {
   .delete-button {
 	display: block !important;
@@ -174,6 +209,7 @@
 	right: 20px;
 	.opacity(0.7)
   }
+
   .standards-lists {
 	.checkbox {
 	  font-size: floor(@font-size-base * 0.9); // ~13px;
@@ -184,6 +220,7 @@
 	  }
 	}
   }
+
   .footer {
 	.nav {
 	  a {

public/less/site.less

@@ -19,21 +19,27 @@
 .crunch {
 	margin: 0 !important;
 }
+
 .crunch-top {
 	margin-top: 0 !important;
 }
+
 .crunch-bottom {
 	margin-bottom: 0 !important;
 }
+
 .block-level {
 	display: block;
 }
+
 .ruled {
 	border-bottom: dotted 1px @gray;
 }
+
 .ruled-sm {
 	margin-bottom: 15px;
 }
+
 .well-med {
 	padding: 15px;
 }
@@ -44,15 +50,18 @@
 	margin-bottom: 30px;
 	background-color: lighten(@gray-lighter, 4%);
 }
+
 .footer {
 	background-color: lighten(@gray-lighter, 4%);
 	padding: 40px 0 20px 0;
 	margin-top: 40px;
 }
+
 .nav {
 	list-style-type: none;
 	padding: 0;
 }
+
 .footer .nav {
 	float: right;
 
@@ -61,6 +70,7 @@
 		-webkit-transition: background 0.3s;
 	}
 }
+
 .supersize-me {
 	text-align: center;
 	font-size: 112px;
@@ -68,13 +78,16 @@
 	font-weight: bold;
 	color: @gray-light;
 }
+
 .floated-list li {
 	float: left;
 }
+
 .btn-full-width {
 	width: 100%;
 	margin-bottom: 10px
 }
+
 .dropdown-menu {
 	width: 100%;
 	top: 40px;
@@ -82,11 +95,18 @@
 	li a {
 		text-indent: -20px;
 	}
+	ul.options-menu  {
+		list-style: none;
+		padding: 5px 0;
+		margin: 2px 10px 0 0;
 	}
+}
+
 .dropdown-toggle {
 	margin-top: 0;
 	margin-bottom: 5px;
 }
+
 .list-group {
 	li .list-group-item {
 		border-radius: 0;
@@ -102,19 +122,23 @@
 		margin-bottom: 0;
 	}
 }
+
 .options-button {
 	position: absolute;
 	top: 5px;
 	right: 20px;
 }
+
 .footer a, .breadcrumb a {
 	text-decoration: underline;
 }
+
 .breadcrumb a {
 	&:hover, &:active, &:focus {
 		text-decoration: none;
 	}
 }
+
 .site-message {
 	.glyphicon {
 		margin-right: 6px;
@@ -127,7 +151,6 @@
 	margin-bottom: (@line-height-computed / 2);
 }
 
-
 /* Task stats boxes */
 .task-stats {
 	margin-bottom: 10px;
@@ -151,22 +174,12 @@
 		}
 	}
 }
+
 .stat-type {
 	font-size: floor(@font-size-base * 0.75); // ~11px;
 	text-transform: uppercase;
 	display: block;
 	line-height: 1.4;
-	.opacity(.8);
-}
-
-.aside .task-stats {
-	li:hover {
-		.opacity(.85);
-
-		a {
-			text-decoration:none;
-		}
-	}
 }
 
 // Stats box colours
@@ -174,10 +187,12 @@
 	background-color: @brand-danger;
 	color: @btn-default-color;
 }
+
 .warning {
 	background-color: @brand-warning;
 	color: @btn-default-color;
 }
+
 .info, .notice {
 	background-color: @brand-info;
 	color: @btn-default-color;
@@ -206,17 +221,10 @@
 		display: block;
 	}
 	.task-card-link:hover,
-	&:hover .task-card-link
+	&:hover .task-card-link {
-	 {
 		text-decoration: none;
 		background-color: darken(@gray-lighter, 2%);
 	}
-	.h3 {
-		text-overflow:ellipsis;
-		overflow:hidden;
-		width:100%;
-		white-space: nowrap;
-	}
 	.task-stats li {
 		padding: 7px 0 6px 0;
 		text-align: center;
@@ -225,8 +233,24 @@
 	.dropdown-menu {
 		top: 25px;
 	}
+	.gridview {
+		.h3 {
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 100%;
+			white-space: nowrap;
+		}
+		.h4 {
+			display: none;
+		}
+	}
+	.listview {
+		padding-left: 0;
+	}
+	.last-run {
+		clear: both;
+	}
 }
-
 
 /* Badges */
 .badge {
@@ -236,11 +260,14 @@
 	font-size: ceil(@font-size-base * 0.85); // ~13px;
 	text-transform: uppercase;
 }
+
 .rule-name .badge {
 	padding: 6px;
+	text-transform: none;
 }
 
 /* Task details page*/
+
 .task-header {
 	margin-bottom: 30px;
 
@@ -255,61 +282,180 @@
 		margin-bottom: 6px;
 	}
 }
+
 .date {
 	margin-top: 5px;
 }
+
 .readonly-mode .date {
 	margin-top: 40px;
 }
+
+.category-list {
+	&__item {
+		font-size: 16px;
+
+		&_type_error,
+		&_type_error.active {
+			.category-list__link,
+			.category-list__link:hover,
+			.category-list__link:focus {
+				color: @brand-danger;
+			}
+		}
+
+		&_type_warning,
+		&_type_warning.active {
+			.category-list__link,
+			.category-list__link:hover,
+			.category-list__link:focus {
+				color: @brand-warning;
+			}
+		}
+
+		&_type_notice,
+		&_type_notice.active {
+			.category-list__link,
+			.category-list__link:hover,
+			.category-list__link:focus {
+				color: @brand-info;
+			}
+		}
+
+		&_type_ignore,
+		&_type_ignore.active {
+			.category-list__link,
+			.category-list__link:hover,
+			.category-list__link:focus {
+				color: @badge-bg;
+			}
+		}
+	}
+}
+
 .tasks-list {
 	padding: 15px;
 	margin-bottom: 30px;
-	border-width:3px;
+	border: 1px solid @gray-lighter;
-	border-style:solid;
+	border-top: 0;
-
-	li {
-		margin-bottom:20px;
-		padding-right:90px;
-		position:relative;
 
+	.panel {
 		&:last-child {
 			margin-bottom: 0;
 		}
 
-		form {
+		.ignore-form {
-			display:none;
+			display: inline-block;
-			position:absolute;
+			vertical-align: middle;
-			right:0;
-			top:0;
 
-			&:hover .btn {
+			.btn {
-				color:@brand-primary;
+				margin: 0;
+				padding: 0;
 			}
 		}
-
-		&:hover form {
-			display:block;
-		}
 	}
 
 	.rule-name {
-		font-weight:bold;
+		font-size: 16px;
-		font-style:italic;
 		word-wrap: break-word;
 	}
 
+	.link {
+		color: #07c;
 	}
-.task-danger {
+
-	border-color:@brand-danger;
+	.to-top {
+		text-align: center;
+
+		.glyphicon {
+			margin-right: 10px;
+		}
+	}
+}
+
+.task {
+	margin-bottom: 16px;
+
+	&_type_error {
+		.rule-name,
+		.ignore-form .link {
+			color: @brand-danger;
+		}
+
+		.badge {
+			background: @brand-danger;
+		}
+	}
+
+	&_type_warning {
+		.rule-name,
+		.ignore-form .link {
+			color: @brand-warning;
+		}
+
+		.badge {
+			background: @brand-warning;
+		}
+	}
+
+	&_type_notice {
+		.rule-name,
+		.ignore-form .link {
+			color: @brand-info;
+		}
+
+		.badge {
+			background: @brand-info;
+		}
+	}
+
+	&_type_ignore {
+		.ignore-form .link {
+			color: @badge-bg;
+		}
+	}
+
+	.subtitle {
+		font-size: 16px;
+		padding: 10px 0 5px;
+	}
+
+	.list-unstyled {
+		&__item {
+			padding: 5px 0;
+		}
+	}
+
+	&-actions {
+		position: relative;
+		text-align: right;
+	}
+
+	.code {
+		cursor: pointer;
+		outline: none;
+	}
+
+	.panel-body {
+		.text {
+			vertical-align: middle;
+		}
+	}
+
+	.btn-details {
+		padding: 0;
+		margin: 0 5px;
+
+		&:before {
+			content: 'Show ';
+		}
+
+		&.btn_state_collapsed {
+			&:before {
+				content: 'Hide ';
 			}
-.task-warning {
-	border-color:@brand-warning;
 		}
-.task-info {
-	border-color:@brand-info;
 	}
-.task-default {
-	border-color:@badge-bg;
 }
 
 /* Task list heading */
@@ -329,13 +475,6 @@
 		margin-top: 0;
 	}
 }
-.expander {
-	cursor:pointer;
-	padding:0 5px;
-	font-weight:bold;
-	font-size:floor(@font-size-base * @line-height-base); // ~20px
-	line-height:1;
-}
 
 /* Date selector */
 ul.date-links {
@@ -346,6 +485,7 @@ ul.date-links {
 	width: 100%;
 	z-index: 10;
 }
+
 .date-selector {
 	margin-bottom: 5px;
 
@@ -368,12 +508,17 @@ ul.date-links {
 		padding: 0;
 		margin: 0;
 	}
+	.dates-list > li:first-child a {
+		font-weight: bold;
+		font-size: 16px;
+	}
 
 	.dates-list a {
 		color: #fff;
 		text-decoration: underline;
 	}
 }
+
 .single-result .date-selector-row {
 	display: none;
 }
@@ -383,10 +528,12 @@ ul.date-links {
 	height: 300px;
 	width: 100%;
 }
+
 .graph-spacer {
-	margin-bottom:30px;
+	margin-bottom: 40px;
 	padding-bottom: 30px;
 }
+
 .graph-table {
 	margin-bottom: 0;
 
@@ -394,29 +541,29 @@ ul.date-links {
 		width: 25%;
 	}
 }
+
 .series-checkboxes {
-	margin-top:15px;
+	padding: 0 15px;
+	margin-bottom: 16px;
 
 	li {
 		width: 32%;
 		margin-right: 2%;
 		border-radius: @border-radius-base;
 
-		label {
+		.series-checkbox-container {
-			margin-bottom:0;
+			padding: 4px 4px 5px 4px;
 		}
 
-		.series-checkbox-container {
+		label {
-			padding:2px 4px 3px 4px;
+			margin: 0;
+			padding: 0 0 0 12px;
+			cursor: pointer;
 		}
 
 		input {
-			margin:5px auto 3px auto;
+			margin: 6px 0;
-		}
-
-		input, label {
 			cursor: pointer;
-			display:block;
 		}
 
 		&:last-child {
@@ -428,23 +575,28 @@ ul.date-links {
 		}
 	}
 }
+
 .btn-reset {
-	margin-top:12px;
+	margin: 12px 18px 0;
 }
+
 .flot-x-axis {
 	.flot-tick-label {
 		max-width: 45px !important;
 	}
 }
+
 .tooltip-graph {
 	font-size: 12px;
 }
+
 .custom-legend .legend {
 	display: none !important;
 }
+
 .dashedLegend {
 	position: absolute;
-	top:17px;
+	top: 70px;
 	right: 40px;
 	font-size: smaller;
 	color: #545454;
@@ -452,51 +604,62 @@ ul.date-links {
 	background-color: rgba(255, 255, 255, 0.75);
 	display: none;
 }
+
 .dashedContainer {
 	background: #fff;
 	border: 1px solid #808080;
 	margin: 5px;
 	padding-top: 5px;
 }
+
 .dashedLegend tr {
 	display: none;
 }
+
 .dashedLegend .legendColorBox > div:first-child {
 	border: 1px solid rgb(204, 204, 204);
 	padding: 3px;
 }
+
 .dashedLegend .legendIcon div {
-	height: 0px;
+	height: 0;
-	border-width: 3px 0px 0px;
+	border-width: 3px 0 0;
 	border-top-style: solid;
 	overflow: hidden;
 }
+
 .dashedLegend .legendErrors div {
 	width: 25px;
 	border-top-color: rgb(216, 61, 45);
 }
+
 .dashedLegend .legendWarnings div {
 	width: 10px;
 	border-top-color: rgb(168, 103, 0);
 	float: left;
 }
+
 .dashedLegend .legendWarnings div:first-child {
 	margin-right: 5px;
 }
+
 .dashedLegend .legendNotices div {
 	width: 5px;
 	border-top-color: rgb(23, 123, 190);
 	float: left;
 	margin-left: 5px;
 }
+
 .dashedLegend .legendNotices div:first-child {
 	margin-left: 0;
 }
+
 .dashedLegend td.legendColorBox {
 	padding-right: 5px;
 	padding-bottom: 5px;
 	padding-left: 10px;
 }
+
 .dashedLegend td.legendLabel {
 	padding-right: 10px;
 	padding-bottom: 5px;
@@ -508,7 +671,7 @@ ul.date-links {
 	overflow: hidden;
 	overflow-y: auto;
 	margin-bottom: 15px;
-	border-bottom:solid 1px @gray-lighter;
+	border-bottom: 1px solid @gray-lighter;
 
 	.checkbox {
 		cursor: pointer;
@@ -543,7 +706,7 @@ ul.date-links {
 
 	&:before {
 		position: absolute;
-		content:"";
+		content: '';
 		height: 90px;
 		width: 90px;
 		left: 50%;
@@ -556,6 +719,16 @@ ul.date-links {
 	}
 }
 
+/* Edit task page */
+
+#skipRules {
+	position: absolute;
+	left: -999px;
+}
+#skipRules:focus {
+	position: static;
+}
+
 /* inline link list */
 
 .inline-list {
@@ -563,6 +736,7 @@ ul.date-links {
 	margin: 0;
 	padding: 0;
 }
+
 .inline-list > li {
 	display: inline-block;
 	border-right: 1px solid @dropdown-fallback-border; // IE8 fallback
@@ -570,6 +744,43 @@ ul.date-links {
 	padding: 0 4px 0 0;
 	margin: 0 4px 0 0;
 }
+
 .inline-list + div.date {
 	display: inline-block;
 }
+
+/* Popovers */
+.popover-content {
+	overflow-x: auto;
+}
+
+/*list and grid view buttons */
+.view-btn {
+	&.btn-default, &.btn-default:hover, &.btn-default:focus {
+		color: #ffffff;
+	}
+	&:hover {
+		color: #000000;
+	}
+	&:last-child:not(:first-child) {
+		border-bottom-left-radius: 0;
+		border-top-left-radius: 0;
+		margin-left: -3px;
+	}
+	&:first-child:not(:last-child) {
+		border-bottom-right-radius: 0;
+		border-top-right-radius: 0;
+	}
+}
+
+/*close button on success alert*/
+.alert-success {
+  .close {
+		color: #fff;
+		opacity: 1;
+	};
+}
+
+section {
+	margin: 1em 0;
+}

public/less/tables.less

@@ -2,16 +2,15 @@
 // Tables
 // --------------------------------------------------
 
-
 table {
   max-width: 100%;
   background-color: @table-bg;
 }
+
 th {
   text-align: left;
 }
 
-
 // Baseline styles
 
 .table {
@@ -58,7 +57,6 @@ th {
   }
 }
 
-
 // Condensed table w/ half padding
 
 .table-condensed {
@@ -74,7 +72,6 @@ th {
   }
 }
 
-
 // Bordered version
 //
 // Add borders all around the table and between all the columns.
@@ -101,7 +98,6 @@ th {
   }
 }
 
-
 // Zebra-striping
 //
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
@@ -117,7 +113,6 @@ th {
   }
 }
 
-
 // Hover effect
 //
 // Placed here since it has to come after the potential zebra striping
@@ -133,7 +128,6 @@ th {
   }
 }
 
-
 // Table cell sizing
 //
 // Reset default table behavior
@@ -142,6 +136,7 @@ table col[class*="col-"] {
   float: none;
   display: table-column;
 }
+
 table {
   td,
   th {
@@ -152,7 +147,6 @@ table {
   }
 }
 
-
 // Table backgrounds
 //
 // Exact selectors below required to override `.table-striped` and prevent
@@ -174,7 +168,6 @@ table {
 .table-row-variant(danger; @state-danger-bg; @state-danger-border);
 .table-row-variant(warning; @state-warning-bg; @state-warning-border);
 
-
 // Responsive tables
 //
 // Wrap your tables in `.table-responsive` and we'll make them mobile friendly
@@ -240,7 +233,6 @@ table {
 		  }
 		}
 	  }
-
 	}
   }
 }

public/less/theme.less

@@ -1,13 +1,9 @@
-
 //
 // Load core variables and mixins
 // --------------------------------------------------
-
 @import "variables.less";
 @import "mixins.less";
 
-
-
 //
 // Buttons
 // --------------------------------------------------
@@ -59,14 +55,31 @@
 }
 
 // Apply the mixin to the buttons
-.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
+.btn-default {
-.btn-primary { .btn-styles(@btn-primary-bg); }
+  .btn-styles(@btn-default-bg);
-.btn-success { .btn-styles(@btn-success-bg); }
+  text-shadow: 0 1px 0 #fff;
-.btn-warning { .btn-styles(@btn-warning-bg); }
+  border-color: #ccc;
-.btn-danger  { .btn-styles(@btn-danger-bg); }
+}
-.btn-info    { .btn-styles(@btn-info-bg); }
 
+.btn-primary {
+  .btn-styles(@btn-primary-bg);
+}
 
+.btn-success {
+  .btn-styles(@btn-success-bg);
+}
+
+.btn-warning {
+  .btn-styles(@btn-warning-bg);
+}
+
+.btn-danger {
+  .btn-styles(@btn-danger-bg);
+}
+
+.btn-info {
+  .btn-styles(@btn-info-bg);
+}
 
 //
 // Images
@@ -77,8 +90,6 @@
   .box-shadow(0 1px 2px rgba(0, 0, 0, .075));
 }
 
-
-
 //
 // Dropdowns
 // --------------------------------------------------
@@ -88,6 +99,7 @@
   #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
   background-color: darken(@dropdown-link-hover-bg, 5%);
 }
+
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
@@ -95,8 +107,6 @@
   background-color: darken(@dropdown-link-active-bg, 5%);
 }
 
-
-
 //
 // Navbar
 // --------------------------------------------------
@@ -113,6 +123,7 @@
 	.box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075));
   }
 }
+
 .navbar-brand,
 .navbar-nav > li > a {
   text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
@@ -140,8 +151,6 @@
   border-radius: 0;
 }
 
-
-
 //
 // Alerts
 // --------------------------------------------------
@@ -160,12 +169,21 @@
 }
 
 // Apply the mixin to the alerts
-.alert-success    { .alert-styles(@alert-success-bg); }
+.alert-success {
-.alert-info       { .alert-styles(@alert-info-bg); }
+  .alert-styles(@alert-success-bg);
-.alert-warning    { .alert-styles(@alert-warning-bg); }
+}
-.alert-danger     { .alert-styles(@alert-danger-bg); }
 
+.alert-info {
+  .alert-styles(@alert-info-bg);
+}
 
+.alert-warning {
+  .alert-styles(@alert-warning-bg);
+}
+
+.alert-danger {
+  .alert-styles(@alert-danger-bg);
+}
 
 //
 // Progress bars
@@ -182,13 +200,25 @@
 }
 
 // Apply the mixin to the progress bars
-.progress-bar            { .progress-bar-styles(@progress-bar-bg); }
+.progress-bar {
-.progress-bar-success    { .progress-bar-styles(@progress-bar-success-bg); }
+  .progress-bar-styles(@progress-bar-bg);
-.progress-bar-info       { .progress-bar-styles(@progress-bar-info-bg); }
+}
-.progress-bar-warning    { .progress-bar-styles(@progress-bar-warning-bg); }
-.progress-bar-danger     { .progress-bar-styles(@progress-bar-danger-bg); }
 
+.progress-bar-success {
+  .progress-bar-styles(@progress-bar-success-bg);
+}
 
+.progress-bar-info {
+  .progress-bar-styles(@progress-bar-info-bg);
+}
+
+.progress-bar-warning {
+  .progress-bar-styles(@progress-bar-warning-bg);
+}
+
+.progress-bar-danger {
+  .progress-bar-styles(@progress-bar-danger-bg);
+}
 
 //
 // List groups
@@ -198,6 +228,7 @@
   border-radius: @border-radius-base;
   .box-shadow(0 1px 2px rgba(0, 0, 0, .075));
 }
+
 .list-group-item.active,
 .list-group-item.active:hover,
 .list-group-item.active:focus {
@@ -206,8 +237,6 @@
   border-color: darken(@list-group-active-border, 7.5%);
 }
 
-
-
 //
 // Panels
 // --------------------------------------------------
@@ -223,14 +252,29 @@
 }
 
 // Apply the mixin to the panel headings only
-.panel-default > .panel-heading   { .panel-heading-styles(@panel-default-heading-bg); }
+.panel-default > .panel-heading {
-.panel-primary > .panel-heading   { .panel-heading-styles(@panel-primary-heading-bg); }
+  .panel-heading-styles(@panel-default-heading-bg);
-.panel-success > .panel-heading   { .panel-heading-styles(@panel-success-heading-bg); }
+}
-.panel-info > .panel-heading      { .panel-heading-styles(@panel-info-heading-bg); }
-.panel-warning > .panel-heading   { .panel-heading-styles(@panel-warning-heading-bg); }
-.panel-danger > .panel-heading    { .panel-heading-styles(@panel-danger-heading-bg); }
 
+.panel-primary > .panel-heading {
+  .panel-heading-styles(@panel-primary-heading-bg);
+}
 
+.panel-success > .panel-heading {
+  .panel-heading-styles(@panel-success-heading-bg);
+}
+
+.panel-info > .panel-heading {
+  .panel-heading-styles(@panel-info-heading-bg);
+}
+
+.panel-warning > .panel-heading {
+  .panel-heading-styles(@panel-warning-heading-bg);
+}
+
+.panel-danger > .panel-heading {
+  .panel-heading-styles(@panel-danger-heading-bg);
+}
 
 //
 // Wells

public/less/thumbnails.less

@@ -2,7 +2,6 @@
 // Thumbnails
 // --------------------------------------------------
 
-
 // Mixin and adjust the regular image class
 .thumbnail {
   .img-thumbnail();
@@ -14,7 +13,6 @@
   }
 }
 
-
 // Add a hover state for linked versions only
 a.thumbnail:hover,
 a.thumbnail:focus {
@@ -26,6 +24,7 @@ a.thumbnail:focus {
   margin-left: auto;
   margin-right: auto;
 }
+
 .thumbnail .caption {
   padding: @thumbnail-caption-padding;
   color: @thumbnail-caption-color;

public/less/tooltip.less

@@ -2,7 +2,6 @@
 // Tooltips
 // --------------------------------------------------
 
-
 // Base class
 .tooltip {
   position: absolute;
@@ -13,11 +12,25 @@
   line-height: 1.4;
   .opacity(0);
 
-  &.in     { .opacity(.9); }
+  &.in {
-  &.top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }
+	.opacity(.9);
-  &.right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }
+  }
-  &.bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }
+  &.top {
-  &.left   { margin-left: -3px; padding: 0 @tooltip-arrow-width; }
+	margin-top: -3px;
+	padding: @tooltip-arrow-width 0;
+  }
+  &.right {
+	margin-left: 3px;
+	padding: 0 @tooltip-arrow-width;
+  }
+  &.bottom {
+	margin-top: 3px;
+	padding: @tooltip-arrow-width 0;
+  }
+  &.left {
+	margin-left: -3px;
+	padding: 0 @tooltip-arrow-width;
+  }
 }
 
 // Wrapper for the tooltip content
@@ -39,6 +52,7 @@
   border-color: transparent;
   border-style: solid;
 }
+
 .tooltip {
   &.top .tooltip-arrow {
 	bottom: 0;

public/less/type.less

@@ -2,13 +2,13 @@
 // Typography
 // --------------------------------------------------
 
-
 // Body text
 // -------------------------
 
 p {
   margin: 0 0 (@line-height-computed / 2);
 }
+
 .lead {
   margin-bottom: @line-height-computed;
   font-size: (@font-size-base * 1.15);
@@ -20,45 +20,53 @@ p {
   }
 }
 
-
 // Emphasis & misc
 // -------------------------
 
 // Ex: 14px base font * 85% = about 12px
 small,
-.small  { font-size: 85%; }
+.small {
+  font-size: 85%;
+}
 
 // Undo browser default styling
-cite    { font-style: normal; }
+cite {
+  font-style: normal;
+}
 
 // Contextual emphasis
 .text-muted {
   color: @text-muted;
 }
+
 .text-primary {
   color: @brand-primary;
   &:hover {
 	color: darken(@brand-primary, 10%);
   }
 }
+
 .text-warning {
   color: @state-warning-text;
   &:hover {
 	color: darken(@state-warning-text, 10%);
   }
 }
+
 .text-danger {
   color: @state-danger-text;
   &:hover {
 	color: darken(@state-danger-text, 10%);
   }
 }
+
 .text-success {
   color: @state-success-text;
   &:hover {
 	color: darken(@state-success-text, 10%);
   }
 }
+
 .text-info {
   color: @state-info-text;
   &:hover {
@@ -67,10 +75,17 @@ cite    { font-style: normal; }
 }
 
 // Alignment
-.text-left           { text-align: left; }
+.text-left {
-.text-right          { text-align: right; }
+  text-align: left;
-.text-center         { text-align: center; }
+}
 
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
 
 // Headings
 // -------------------------
@@ -99,6 +114,7 @@ h3 {
 	font-size: 65%;
   }
 }
+
 h4,
 h5,
 h6 {
@@ -110,13 +126,29 @@ h6 {
   }
 }
 
-h1, .h1 { font-size: @font-size-h1; }
+h1, .h1 {
-h2, .h2 { font-size: @font-size-h2; }
+  font-size: @font-size-h1;
-h3, .h3 { font-size: @font-size-h3; }
+}
-h4, .h4 { font-size: @font-size-h4; }
-h5, .h5 { font-size: @font-size-h5; }
-h6, .h6 { font-size: @font-size-h6; }
 
+h2, .h2 {
+  font-size: @font-size-h2;
+}
+
+h3, .h3 {
+  font-size: @font-size-h3;
+}
+
+h4, .h4 {
+  font-size: @font-size-h4;
+}
+
+h5, .h5 {
+  font-size: @font-size-h5;
+}
+
+h6, .h6 {
+  font-size: @font-size-h6;
+}
 
 // Page header
 // -------------------------
@@ -127,8 +159,6 @@ h6, .h6 { font-size: @font-size-h6; }
   border-bottom: 1px solid @page-header-border-color;
 }
 
-
-
 // Lists
 // --------------------------------------------------
 
@@ -150,6 +180,7 @@ ol {
   padding-left: 0;
   list-style: none;
 }
+
 // Inline turns list items into inline-block
 .list-inline {
   .list-unstyled();
@@ -164,13 +195,16 @@ ol {
 dl {
   margin-bottom: @line-height-computed;
 }
+
 dt,
 dd {
   line-height: @line-height-base;
 }
+
 dt {
   font-weight: bold;
 }
+
 dd {
   margin-left: 0; // Undo browser default
 }
@@ -206,6 +240,7 @@ abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted @abbr-border-color;
 }
+
 abbr.initialism {
   font-size: 90%;
   text-transform: uppercase;

public/less/utilities.less

@@ -2,41 +2,44 @@
 // Utility classes
 // --------------------------------------------------
 
-
 // Floats
 // -------------------------
 
 .clearfix {
   .clearfix();
 }
+
 .center-block {
   .center-block();
 }
+
 .pull-right {
   float: right !important;
 }
+
 .pull-left {
   float: left !important;
 }
 
-
 // Toggling content
 // -------------------------
 
 .hide {
   display: none !important;
 }
+
 .show {
   display: block !important;
 }
+
 .invisible {
   visibility: hidden;
 }
+
 .text-hide {
   .text-hide();
 }
 
-
 // For Affix plugin
 // -------------------------
 
@@ -44,7 +47,6 @@
   position: fixed;
 }
 
-
 // Cursors
 // -------------------------
 

public/less/variables-flatly.less

@@ -2,7 +2,6 @@
 // Variables
 // --------------------------------------------------
 
-
 // Global values
 // --------------------------------------------------
 
@@ -19,9 +18,9 @@
 // -------------------------
 
 @brand-primary: #2C3E50;
-@brand-success:         #00806F;
+@brand-success: #006053;
-@brand-warning:         #A86700;
+@brand-warning: #b24d04;
-@brand-danger:          #D83D2D;
+@brand-danger: #c92a2a;
 @brand-info: #177BBE;
 
 // Scaffolding
@@ -61,7 +60,6 @@
 @icon-font-path: "../fonts/";
 @icon-font-name: "glyphicons-halflings-regular";
 
-
 // Components
 // -------------------------
 // Based on 14px font-size and 1.428 line-height (~20px to start)
@@ -100,7 +98,6 @@
 
 @table-border-color: @gray-lighter; // table and cell border
 
-
 // Buttons
 // -------------------------
 
@@ -132,7 +129,6 @@
 
 @btn-link-disabled-color: @gray-light;
 
-
 // Forms
 // -------------------------
 
@@ -156,7 +152,6 @@
 @input-group-addon-bg: @gray-lighter;
 @input-group-addon-border-color: @input-border;
 
-
 // Dropdowns
 // -------------------------
 
@@ -178,11 +173,9 @@
 
 @dropdown-caret-color: #000;
 
-
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
-
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -220,7 +213,6 @@
 @screen-sm-max: (@screen-md - 1);
 @screen-md-max: (@screen-lg - 1);
 
-
 // Grid system
 // --------------------------------------------------
 
@@ -231,7 +223,6 @@
 // Point at which the navbar stops collapsing
 @grid-float-breakpoint: @screen-tablet;
 
-
 // Navbar
 // -------------------------
 
@@ -242,7 +233,7 @@
 @navbar-default-bg: @brand-primary;
 @navbar-default-border: darken(@navbar-default-bg, 6.5%);
 @navbar-border-radius: @border-radius-base;
-@navbar-padding-horizontal:        floor(@grid-gutter-width / 2);  // ~15px
+@navbar-padding-horizontal: floor((@grid-gutter-width / 2)); // ~15px
 @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
 
 // Navbar links
@@ -264,7 +255,6 @@
 @navbar-default-toggle-icon-bar-bg: #fff;
 @navbar-default-toggle-border-color: darken(@navbar-default-bg, 10%);
 
-
 // Inverted navbar
 //
 // Reset inverted navbar basics
@@ -298,7 +288,6 @@
 @navbar-inverse-toggle-icon-bar-bg: #fff;
 @navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 10%);
 
-
 // Navs
 // -------------------------
 
@@ -327,7 +316,6 @@
 @nav-pills-active-link-hover-bg: @component-active-bg;
 @nav-pills-active-link-hover-color: #fff;
 
-
 // Pagination
 // -------------------------
 
@@ -341,14 +329,12 @@
 
 @pagination-disabled-color: @gray-lighter;
 
-
 // Pager
 // -------------------------
 
 @pager-border-radius: 15px;
 @pager-disabled-color: #fff;
 
-
 // Jumbotron
 // -------------------------
 
@@ -358,7 +344,6 @@
 
 @jumbotron-heading-color: inherit;
 
-
 // Form states and alerts
 // -------------------------
 
@@ -378,7 +363,6 @@
 @state-info-bg: @brand-info;
 @state-info-border: @brand-info;
 
-
 // Tooltips
 // -------------------------
 @tooltip-max-width: 200px;
@@ -388,7 +372,6 @@
 @tooltip-arrow-width: 5px;
 @tooltip-arrow-color: @tooltip-bg;
 
-
 // Popovers
 // -------------------------
 @popover-bg: #fff;
@@ -405,7 +388,6 @@
 @popover-arrow-outer-color: rgba(0, 0, 0, .25);
 @popover-arrow-outer-fallback-color: #999;
 
-
 // Labels
 // -------------------------
 
@@ -419,7 +401,6 @@
 @label-color: #fff;
 @label-link-hover-color: #fff;
 
-
 // Modals
 // -------------------------
 @modal-inner-padding: 20px;
@@ -435,7 +416,6 @@
 @modal-header-border-color: #e5e5e5;
 @modal-footer-border-color: @modal-header-border-color;
 
-
 // Alerts
 // -------------------------
 @alert-padding: 15px;
@@ -458,7 +438,6 @@
 @alert-danger-text: @state-danger-text;
 @alert-danger-border: @state-danger-border;
 
-
 // Progress bars
 // -------------------------
 @progress-bg: @gray-lighter;
@@ -470,7 +449,6 @@
 @progress-bar-danger-bg: @brand-danger;
 @progress-bar-info-bg: @brand-info;
 
-
 // List group
 // -------------------------
 @list-group-bg: #fff;
@@ -485,7 +463,6 @@
 @list-group-link-color: #555;
 @list-group-link-heading-color: #333;
 
-
 // Panels
 // -------------------------
 @panel-bg: #fff;
@@ -517,7 +494,6 @@
 @panel-info-border: @state-info-border;
 @panel-info-heading-bg: @state-info-bg;
 
-
 // Thumbnails
 // -------------------------
 @thumbnail-padding: 4px;
@@ -528,12 +504,10 @@
 @thumbnail-caption-color: @text-color;
 @thumbnail-caption-padding: 9px;
 
-
 // Wells
 // -------------------------
 @well-bg: @gray-lighter;
 
-
 // Badges
 // -------------------------
 @badge-color: #fff;
@@ -547,14 +521,12 @@
 @badge-line-height: 1;
 @badge-border-radius: 10px;
 
-
 // Breadcrumbs
 // -------------------------
 @breadcrumb-bg: lighten(@gray-lighter, 4%);
 @breadcrumb-color: @gray-dark;
 @breadcrumb-active-color: @breadcrumb-color;
 
-
 // Carousel
 // ------------------------
 
@@ -570,14 +542,12 @@
 
 @carousel-caption-color: #fff;
 
-
 // Close
 // ------------------------
 @close-color: #000;
 @close-font-weight: bold;
 @close-text-shadow: 0 1px 0 #fff;
 
-
 // Code
 // ------------------------
 @code-color: #c7254e;
@@ -606,7 +576,6 @@
 // Horizontal forms & lists
 @component-offset-horizontal: 180px;
 
-
 // Container sizes
 // --------------------------------------------------
 

public/less/variables.less

@@ -2,7 +2,6 @@
 // Variables
 // --------------------------------------------------
 
-
 // Global values
 // --------------------------------------------------
 
@@ -63,14 +62,12 @@
 @headings-line-height: 1.1;
 @headings-color: inherit;
 
-
 // Iconography
 // -------------------------
 
 @icon-font-path: "../fonts/";
 @icon-font-name: "glyphicons-halflings-regular";
 
-
 // Components
 // -------------------------
 // Based on 14px font-size and 1.428 line-height (~20px to start)
@@ -110,7 +107,6 @@
 
 @table-border-color: #ddd; // table and cell border
 
-
 // Buttons
 // -------------------------
 
@@ -142,7 +138,6 @@
 
 @btn-link-disabled-color: @gray-light;
 
-
 // Forms
 // -------------------------
 
@@ -166,7 +161,6 @@
 @input-group-addon-bg: @gray-lighter;
 @input-group-addon-border-color: @input-border;
 
-
 // Dropdowns
 // -------------------------
 
@@ -188,11 +182,9 @@
 
 @dropdown-caret-color: #000;
 
-
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
-
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -238,7 +230,6 @@
 @screen-sm-max: (@screen-md-min - 1);
 @screen-md-max: (@screen-lg-min - 1);
 
-
 // Grid system
 // --------------------------------------------------
 
@@ -249,7 +240,6 @@
 // Point at which the navbar stops collapsing
 @grid-float-breakpoint: @screen-sm-min;
 
-
 // Navbar
 // -------------------------
 
@@ -257,7 +247,7 @@
 @navbar-height: 50px;
 @navbar-margin-bottom: @line-height-computed;
 @navbar-border-radius: @border-radius-base;
-@navbar-padding-horizontal:        floor(@grid-gutter-width / 2);
+@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
 @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
 
 @navbar-default-color: #777;
@@ -283,7 +273,6 @@
 @navbar-default-toggle-icon-bar-bg: #ccc;
 @navbar-default-toggle-border-color: #ddd;
 
-
 // Inverted navbar
 //
 // Reset inverted navbar basics
@@ -310,7 +299,6 @@
 @navbar-inverse-toggle-icon-bar-bg: #fff;
 @navbar-inverse-toggle-border-color: #333;
 
-
 // Navs
 // -------------------------
 
@@ -340,7 +328,6 @@
 @nav-pills-active-link-hover-bg: @component-active-bg;
 @nav-pills-active-link-hover-color: @component-active-color;
 
-
 // Pagination
 // -------------------------
 
@@ -354,14 +341,12 @@
 
 @pagination-disabled-color: @gray-light;
 
-
 // Pager
 // -------------------------
 
 @pager-border-radius: 15px;
 @pager-disabled-color: @gray-light;
 
-
 // Jumbotron
 // -------------------------
 
@@ -371,7 +356,6 @@
 
 @jumbotron-heading-color: inherit;
 
-
 // Form states and alerts
 // -------------------------
 
@@ -391,7 +375,6 @@
 @state-danger-bg: #f2dede;
 @state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
 
-
 // Tooltips
 // -------------------------
 @tooltip-max-width: 200px;
@@ -401,7 +384,6 @@
 @tooltip-arrow-width: 5px;
 @tooltip-arrow-color: @tooltip-bg;
 
-
 // Popovers
 // -------------------------
 @popover-bg: #fff;
@@ -418,7 +400,6 @@
 @popover-arrow-outer-color: rgba(0, 0, 0, .25);
 @popover-arrow-outer-fallback-color: #999;
 
-
 // Labels
 // -------------------------
 
@@ -432,7 +413,6 @@
 @label-color: #fff;
 @label-link-hover-color: #fff;
 
-
 // Modals
 // -------------------------
 @modal-inner-padding: 20px;
@@ -448,7 +428,6 @@
 @modal-header-border-color: #e5e5e5;
 @modal-footer-border-color: @modal-header-border-color;
 
-
 // Alerts
 // -------------------------
 @alert-padding: 15px;
@@ -471,7 +450,6 @@
 @alert-danger-text: @state-danger-text;
 @alert-danger-border: @state-danger-border;
 
-
 // Progress bars
 // -------------------------
 @progress-bg: #f5f5f5;
@@ -483,7 +461,6 @@
 @progress-bar-danger-bg: @brand-danger;
 @progress-bar-info-bg: @brand-info;
 
-
 // List group
 // -------------------------
 @list-group-bg: #fff;
@@ -498,7 +475,6 @@
 @list-group-link-color: #555;
 @list-group-link-heading-color: #333;
 
-
 // Panels
 // -------------------------
 @panel-bg: #fff;
@@ -530,7 +506,6 @@
 @panel-info-border: @state-info-border;
 @panel-info-heading-bg: @state-info-bg;
 
-
 // Thumbnails
 // -------------------------
 @thumbnail-padding: 4px;
@@ -541,13 +516,11 @@
 @thumbnail-caption-color: @text-color;
 @thumbnail-caption-padding: 9px;
 
-
 // Wells
 // -------------------------
 @well-bg: #f5f5f5;
 @well-bg-drk: #2c3e50;
 
-
 // Badges
 // -------------------------
 @badge-color: #fff;
@@ -561,7 +534,6 @@
 @badge-line-height: 1;
 @badge-border-radius: 10px;
 
-
 // Breadcrumbs
 // -------------------------
 @breadcrumb-bg: #f5f5f5;
@@ -569,7 +541,6 @@
 @breadcrumb-active-color: @gray-light;
 @breadcrumb-separator: "/";
 
-
 // Carousel
 // ------------------------
 
@@ -585,14 +556,12 @@
 
 @carousel-caption-color: #fff;
 
-
 // Close
 // ------------------------
 @close-font-weight: bold;
 @close-color: #000;
 @close-text-shadow: 0 1px 0 #fff;
 
-
 // Code
 // ------------------------
 @code-color: #c7254e;
@@ -621,7 +590,6 @@
 // Horizontal forms & lists
 @component-offset-horizontal: 180px;
 
-
 // Container sizes
 // --------------------------------------------------
 

public/less/wells.less

@@ -2,7 +2,6 @@
 // Wells
 // --------------------------------------------------
 
-
 // Base class
 .well {
   min-height: 20px;
@@ -12,6 +11,7 @@
   border: 1px solid darken(@well-bg, 7%);
   border-radius: @border-radius-base;
   .box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05));
+
   blockquote {
 	border-color: #ddd;
 	border-color: rgba(0, 0, 0, .15);
@@ -23,6 +23,7 @@
   padding: 24px;
   border-radius: @border-radius-large;
 }
+
 .well-sm {
   padding: 9px;
   border-radius: @border-radius-small;

route/index.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const presentTask = require('../view/presenter/task');
@@ -21,14 +20,14 @@ module.exports = route;
 
 // Route definition
 function route(app) {
-	app.express.get('/', (req, res, next) => {
+	app.express.get('/', (request, response, next) => {
-		app.webservice.tasks.get({lastres: true}, (err, tasks) => {
+		app.webservice.tasks.get({lastres: true}, (error, tasks) => {
-			if (err) {
+			if (error) {
-				return next(err);
+				return next(error);
 			}
-			res.render('index', {
+			response.render('index', {
 				tasks: tasks.map(presentTask),
-				deleted: (typeof req.query.deleted !== 'undefined'),
+				deleted: (typeof request.query.deleted !== 'undefined'),
 				isHomePage: true
 			});
 		});

route/new.js

@@ -1,3 +1,4 @@
+/* eslint-disable complexity */
 // This file is part of Pa11y Dashboard.
 //
 // Pa11y Dashboard is free software: you can redistribute it and/or modify
@@ -12,9 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
-/*jshint maxcomplexity:10*/
-
 'use strict';
 
 const getStandards = require('../data/standards');
@@ -25,42 +23,32 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/new', (req, res) => {
+	app.express.get('/new', (request, response) => {
 		const standards = getStandards().map(standard => {
 			if (standard.title === 'WCAG2AA') {
 				standard.selected = true;
 			}
 			return standard;
 		});
-		res.render('new', {
+		response.render('new', {
-			standards: standards,
+			standards,
 			isNewTaskPage: true
 		});
 	});
 
-	app.express.post('/new', (req, res) => {
+	app.express.post('/new', (request, response) => {
 
+		const parsedActions = parseActions(request.body.actions);
 		let parsedHeaders;
-		if (req.body.headers) {
+
-			parsedHeaders = httpHeaders(req.body.headers, true);
+		if (request.body.headers) {
+			parsedHeaders = httpHeaders(request.body.headers, true);
 		}
-		console.log(parsedHeaders);
 
-		const newTask = {
+		const newTask = createNewTask(request, parsedActions, parsedHeaders);
-			name: req.body.name,
-			url: req.body.url,
-			standard: req.body.standard,
-			ignore: req.body.ignore || [],
-			timeout: req.body.timeout || undefined,
-			wait: req.body.wait || undefined,
-			username: req.body.username || undefined,
-			password: req.body.password || undefined,
-			headers: parsedHeaders,
-			hideElements: req.body.hideElements || undefined
-		};
 
-		app.webservice.tasks.create(newTask, (err, task) => {
+		app.webservice.tasks.create(newTask, (error, task) => {
-			if (err) {
+			if (error) {
 				const standards = getStandards().map(standard => {
 					if (standard.title === newTask.standard) {
 						standard.selected = true;
@@ -73,14 +61,45 @@ function route(app) {
 					});
 					return standard;
 				});
-				return res.render('new', {
+				newTask.actions = request.body.actions;
-					error: err,
+				newTask.headers = request.body.headers;
-					standards: standards,
+				return response.render('new', {
+					error,
+					standards,
 					task: newTask
 				});
 			}
-			res.redirect(`/${task.id}?added`);
+			response.redirect(`/${task.id}?added`);
 		});
 	});
 
 }
+
+function parseActions(actions) {
+	if (actions) {
+		return actions.split(/[\r\n]+/)
+			.map(action => {
+				return action.trim();
+			})
+			.filter(action => {
+				return Boolean(action);
+			});
+	}
+}
+
+/* eslint-disable complexity */
+function createNewTask(request, actions, headers) {
+	return {
+		name: request.body.name,
+		url: request.body.url,
+		standard: request.body.standard,
+		ignore: request.body.ignore || [],
+		timeout: request.body.timeout || undefined,
+		wait: request.body.wait || undefined,
+		actions,
+		username: request.body.username || undefined,
+		password: request.body.password || undefined,
+		headers,
+		hideElements: request.body.hideElements || undefined
+	};
+}

route/result/download.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const moment = require('moment');
@@ -22,20 +21,20 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	function getTaskAndResult(req, res, next) {
+	function getTaskAndResult(request, response, next) {
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next('route');
 			}
 			app.webservice
-				.task(req.params.id)
+				.task(request.params.id)
-				.result(req.params.rid)
+				.result(request.params.rid)
-				.get({full: true}, (err, result) => {
+				.get({full: true}, (webserviceError, result) => {
-					if (err) {
+					if (webserviceError) {
 						return next('route');
 					}
-					res.locals.task = task;
+					response.locals.task = task;
-					res.locals.result = result;
+					response.locals.result = result;
 					next();
 				});
 		});
@@ -48,7 +47,7 @@ function route(app) {
 			task.url
 				.replace(/^https?:\/\//i, '')
 				.replace(/\/$/, '')
-				.replace(/[^a-z0-9\.\-\_]+/gi, '-'),
+				.replace(/[^a-z0-9.\-_]+/gi, '-'),
 			'--',
 			task.standard.toLowerCase(),
 			'--',
@@ -58,9 +57,9 @@ function route(app) {
 		].join('');
 	}
 
-	app.express.get('/:id/:rid.csv', getTaskAndResult, (req, res) => {
+	app.express.get('/:id/:rid.csv', getTaskAndResult, (request, response) => {
-		const task = res.locals.task;
+		const task = response.locals.task;
-		const result = res.locals.result;
+		const result = response.locals.result;
 		const rows = ['"code","message","type","context","selector"'];
 		result.results.forEach(msg => {
 			rows.push([
@@ -71,18 +70,18 @@ function route(app) {
 				JSON.stringify(msg.selector)
 			].join(','));
 		});
-		res.attachment(getDownloadFileName(task, result, 'csv'));
+		response.attachment(getDownloadFileName(task, result, 'csv'));
-		res.send(rows.join('\n'));
+		response.send(rows.join('\n'));
 	});
 
-	app.express.get('/:id/:rid.json', getTaskAndResult, (req, res) => {
+	app.express.get('/:id/:rid.json', getTaskAndResult, (request, response) => {
-		const task = res.locals.task;
+		const task = response.locals.task;
-		const result = res.locals.result;
+		const result = response.locals.result;
-		res.attachment(getDownloadFileName(task, result, 'json'));
+		response.attachment(getDownloadFileName(task, result, 'json'));
 		delete task.id;
 		delete result.id;
 		result.task = task;
-		res.send(result);
+		response.send(result);
 	});
 
 }

route/result/index.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const presentTask = require('../../view/presenter/task');
@@ -23,19 +22,19 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/:rid', (req, res, next) => {
+	app.express.get('/:id/:rid', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
 			app.webservice
-				.task(req.params.id)
+				.task(request.params.id)
-				.result(req.params.rid)
+				.result(request.params.rid)
-				.get({full: true}, (err, result) => {
+				.get({full: true}, (webserviceError, result) => {
-					if (err) {
+					if (webserviceError) {
 						return next();
 					}
-					res.render('result', {
+					response.render('result', {
 						task: presentTask(task),
 						mainResult: presentResult(result),
 						isResultPage: true

route/task/delete.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const presentTask = require('../../view/presenter/task');
@@ -22,24 +21,24 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/delete', (req, res, next) => {
+	app.express.get('/:id/delete', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			res.render('task/delete', {
+			response.render('task/delete', {
 				task: presentTask(task),
 				isTaskSubPage: true
 			});
 		});
 	});
 
-	app.express.post('/:id/delete', (req, res, next) => {
+	app.express.post('/:id/delete', (request, response, next) => {
-		app.webservice.task(req.params.id).remove(err => {
+		app.webservice.task(request.params.id).remove(error => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			res.redirect('/?deleted');
+			response.redirect('/?deleted');
 		});
 	});
 

route/task/edit.js

@@ -12,9 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
-/*jshint maxcomplexity:10*/
-
 'use strict';
 
 const presentTask = require('../../view/presenter/task');
@@ -26,9 +23,9 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/edit', (req, res, next) => {
+	app.express.get('/:id/edit', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
 			const standards = getStandards().map(standard => {
@@ -43,38 +40,60 @@ function route(app) {
 				});
 				return standard;
 			});
-			res.render('task/edit', {
+			task.actions = (task.actions ? task.actions.join('\n') : '');
-				edited: (typeof req.query.edited !== 'undefined'),
+			response.render('task/edit', {
-				standards: standards,
+				edited: (typeof request.query.edited !== 'undefined'),
+				standards,
 				task: presentTask(task),
 				isTaskSubPage: true
 			});
 		});
 	});
 
-	app.express.post('/:id/edit', (req, res, next) => {
+	/* eslint-disable complexity */
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+	/* eslint-disable max-statements */
-			if (err) {
+	app.express.post('/:id/edit', (request, response, next) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
+			if (error) {
 				return next();
 			}
-			const originalHeaders = req.body.headers;
+			const originalActions = request.body.actions;
-			req.body.ignore = req.body.ignore || [];
+			const originalHeaders = request.body.headers;
-			req.body.timeout = req.body.timeout || undefined;
+
-			req.body.wait = req.body.wait || undefined;
+			request.body.ignore = request.body.ignore || [];
-			req.body.username = req.body.username || undefined;
+			request.body.timeout = request.body.timeout || undefined;
-			req.body.password = req.body.password || undefined;
+			request.body.wait = request.body.wait || undefined;
-			req.body.hideElements = req.body.hideElements || undefined;
+
-			req.body.headers = httpHeaders(req.body.headers || '', true);
+			if (request.body.actions) {
-			app.webservice.task(req.params.id).edit(req.body, err => {
+				request.body.actions = request.body.actions.split(/[\r\n]+/)
-				if (err) {
+					.map(action => {
-					task.name = req.body.name;
+						return action.trim();
-					task.ignore = req.body.ignore;
+					})
-					task.timeout = req.body.timeout;
+					.filter(action => {
-					task.wait = req.body.wait;
+						return Boolean(action);
-					task.username = req.body.username;
+					});
-					task.password = req.body.password;
+			}
+
+			if (!request.body.actions) {
+				request.body.actions = [];
+			}
+
+			request.body.username = request.body.username || undefined;
+			request.body.password = request.body.password || undefined;
+			request.body.hideElements = request.body.hideElements || undefined;
+			request.body.headers = httpHeaders(request.body.headers || '', true);
+
+			app.webservice.task(request.params.id).edit(request.body, webserviceError => {
+				if (webserviceError) {
+					task.name = request.body.name;
+					task.ignore = request.body.ignore;
+					task.timeout = request.body.timeout;
+					task.wait = request.body.wait;
+					task.actions = originalActions;
+					task.username = request.body.username;
+					task.password = request.body.password;
 					task.headers = originalHeaders;
-					task.hideElements = req.body.hideElements;
+					task.hideElements = request.body.hideElements;
 					const standards = getStandards().map(standard => {
 						if (standard.title === task.standard) {
 							standard.selected = true;
@@ -87,14 +106,14 @@ function route(app) {
 						});
 						return standard;
 					});
-					return res.render('task/edit', {
+					return response.render('task/edit', {
-						error: err,
+						webserviceError,
-						standards: standards,
+						standards,
-						task: task,
+						task,
 						isTaskSubPage: true
 					});
 				}
-				res.redirect(`/${req.params.id}/edit?edited`);
+				response.redirect(`/${request.params.id}/edit?edited`);
 			});
 		});
 	});

route/task/ignore.js

@@ -5,20 +5,20 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.post('/:id/ignore', (req, res, next) => {
+	app.express.post('/:id/ignore', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
 			const edit = {
 				name: task.name,
 				ignore: task.ignore
 			};
-			if (typeof req.body.rule === 'string') {
+			if (typeof request.body.rule === 'string') {
-				edit.ignore.push(req.body.rule);
+				edit.ignore.push(request.body.rule);
 			}
-			app.webservice.task(req.params.id).edit(edit, () => {
+			app.webservice.task(request.params.id).edit(edit, () => {
-				res.redirect(`/${req.params.id}?rule-ignored`);
+				response.redirect(`/${request.params.id}?rule-ignored`);
 			});
 		});
 	});

route/task/index.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const presentTask = require('../../view/presenter/task');
@@ -24,24 +23,24 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id', (req, res, next) => {
+	app.express.get('/:id', (request, response, next) => {
-		app.webservice.task(req.params.id).get({lastres: true}, (err, task) => {
+		app.webservice.task(request.params.id).get({lastres: true}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			app.webservice.task(req.params.id).results({}, (err, results) => {
+			app.webservice.task(request.params.id).results({}, (webserviceError, results) => {
-				if (err) {
+				if (webserviceError) {
-					return next(err);
+					return next(webserviceError);
 				}
 				const presentedResults = presentResultList(results.map(presentResult));
-				res.render('task', {
+				response.render('task', {
 					task: presentTask(task),
 					results: presentedResults,
 					mainResult: task.lastResult || null,
-					added: (typeof req.query.added !== 'undefined'),
+					added: (typeof request.query.added !== 'undefined'),
-					running: (typeof req.query.running !== 'undefined'),
+					running: (typeof request.query.running !== 'undefined'),
-					ruleIgnored: (typeof req.query['rule-ignored'] !== 'undefined'),
+					ruleIgnored: (typeof request.query['rule-ignored'] !== 'undefined'),
-					ruleUnignored: (typeof req.query['rule-unignored'] !== 'undefined'),
+					ruleUnignored: (typeof request.query['rule-unignored'] !== 'undefined'),
 					hasOneResult: (presentedResults.length < 2),
 					isTaskPage: true
 				});

route/task/run.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 module.exports = route;
@@ -20,12 +19,12 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/run', (req, res, next) => {
+	app.express.get('/:id/run', (request, response, next) => {
-		app.webservice.task(req.params.id).run(err => {
+		app.webservice.task(request.params.id).run(error => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			res.redirect(`/${req.params.id}?running`);
+			response.redirect(`/${request.params.id}?running`);
 		});
 	});
 

route/task/unignore.js

@@ -5,21 +5,21 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.post('/:id/unignore', (req, res, next) => {
+	app.express.post('/:id/unignore', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, (err, task) => {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
 			const edit = {
 				name: task.name,
 				ignore: task.ignore
 			};
-			const indexOfRule = edit.ignore.indexOf(req.body.rule);
+			const indexOfRule = edit.ignore.indexOf(request.body.rule);
-			if (typeof req.body.rule === 'string' && indexOfRule !== -1) {
+			if (typeof request.body.rule === 'string' && indexOfRule !== -1) {
 				edit.ignore.splice(indexOfRule, 1);
 			}
-			app.webservice.task(req.params.id).edit(edit, () => {
+			app.webservice.task(request.params.id).edit(edit, () => {
-				res.redirect(`/${req.params.id}?rule-unignored`);
+				response.redirect(`/${request.params.id}?rule-unignored`);
 			});
 		});
 	});

test/.eslintrc.js

@@ -0,0 +1,15 @@
+'use strict';
+
+// Clone the main config
+const config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc')));
+
+// We use `this` all over the integration tests
+config.rules['no-invalid-this'] = 'off';
+
+// Because of our use of `this`, arrow functions
+// aren't really gonna work in the integration tests
+config.rules['prefer-arrow-callback'] = 'off';
+
+// Disable max line length/statements
+config.rules['max-len'] = 'off';
+config.rules['max-statements'] = 'off';

test/integration/helper/navigate.js

@@ -38,12 +38,15 @@ function createNavigator(baseUrl, store) {
 			json: opts.json || false,
 			qs: opts.query,
 			followAllRedirects: true
-		}, function(err, res, body) {
+		}, function(error, response, body) {
+			if (error) {
+				return callback(error);
+			}
 
 			store.body = body;
-			store.request = res.request;
+			store.request = response.request;
-			store.response = res;
+			store.response = response;
-			store.status = res.statusCode;
+			store.status = response.statusCode;
 
 			if (opts.nonDom) {
 				store.dom = null;

test/integration/route/index.js

@@ -21,11 +21,11 @@ const assert = require('proclaim');
 describe.only('GET /', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -40,10 +40,19 @@ describe.only('GET /', function() {
 
 	it('should display all of the expected tasks', function() {
 		const tasks = this.last.dom('[data-test=task]');
-		assert.strictEqual(tasks.length, 3);
+		assert.strictEqual(tasks.length, 4);
-		assert.match(tasks.eq(0).text(), /npg home\s+\(wcag2aa\)/i);
+		assert.equal(tasks.eq(0).find('.h3').text(), 'NPG Home');
-		assert.match(tasks.eq(1).text(), /npg home\s+\(wcag2aaa\)/i);
+		assert.equal(tasks.eq(0).find('.h4').text(), 'nature.com');
-		assert.match(tasks.eq(2).text(), /nature news\s+\(section508\)/i);
+		assert.equal(tasks.eq(0).find('.h5').text(), '(WCAG2AA)');
+		assert.equal(tasks.eq(1).find('.h3').text(), 'NPG Home');
+		assert.equal(tasks.eq(1).find('.h4').text(), 'nature.com');
+		assert.equal(tasks.eq(1).find('.h5').text(), '(WCAG2AAA)');
+		assert.equal(tasks.eq(2).find('.h3').text(), 'Nature News');
+		assert.equal(tasks.eq(2).find('.h4').text(), 'nature.com/news');
+		assert.equal(tasks.eq(2).find('.h5').text(), '(Section508)');
+		assert.equal(tasks.eq(3).find('.h3').text(), 'Z Integration Test');
+		assert.equal(tasks.eq(3).find('.h4').text(), 'localhost:8132');
+		assert.equal(tasks.eq(3).find('.h5').text(), '(WCAG2AA)');
 	});
 
 	it('should have links to each task', function() {
@@ -51,6 +60,7 @@ describe.only('GET /', function() {
 		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001"]').length, 1);
 		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002"]').length, 1);
 		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003"]').length, 1);
+		assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004"]').length, 1);
 	});
 
 	it('should display an "Edit" button for each task', function() {
@@ -58,6 +68,7 @@ describe.only('GET /', function() {
 		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/edit"]').length, 1);
 		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/edit"]').length, 1);
 		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/edit"]').length, 1);
+		assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004/edit"]').length, 1);
 	});
 
 	it('should display a "Delete" button for each task', function() {
@@ -65,6 +76,7 @@ describe.only('GET /', function() {
 		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/delete"]').length, 1);
 		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/delete"]').length, 1);
 		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/delete"]').length, 1);
+		assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004/delete"]').length, 1);
 	});
 
 	it('should display a "Run" button for each task', function() {
@@ -72,6 +84,7 @@ describe.only('GET /', function() {
 		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/run"]').length, 1);
 		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/run"]').length, 1);
 		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/run"]').length, 1);
+		assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004/run"]').length, 1);
 	});
 
 	it('should display the task result counts if the task has been run', function() {

test/integration/route/new.js

@@ -21,11 +21,11 @@ const assert = require('proclaim');
 describe('GET /new', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/new'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -70,6 +70,11 @@ describe('GET /new', function() {
 			assert.strictEqual(field.attr('value'), '');
 		});
 
+		it('should have an "actions" field', function() {
+			const field = this.form.find('textarea[name=actions]').eq(0);
+			assert.isDefined(field);
+		});
+
 		it('should have a "username" field', function() {
 			const field = this.form.find('input[name=username]').eq(0);
 			assert.isDefined(field);
@@ -117,7 +122,7 @@ describe('POST /new', function() {
 	describe('with invalid query', function() {
 
 		beforeEach(function(done) {
-			const req = {
+			const request = {
 				method: 'POST',
 				endpoint: '/new',
 				form: {
@@ -125,7 +130,7 @@ describe('POST /new', function() {
 					url: ''
 				}
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -141,7 +146,7 @@ describe('POST /new', function() {
 	describe('with valid query', function() {
 
 		beforeEach(function(done) {
-			const req = {
+			const request = {
 				method: 'POST',
 				endpoint: '/new',
 				form: {
@@ -150,7 +155,7 @@ describe('POST /new', function() {
 					standard: 'WCAG2AA'
 				}
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -158,9 +163,9 @@ describe('POST /new', function() {
 		});
 
 		it('should create the task', function(done) {
-			this.webservice.tasks.get({}, function(err, tasks) {
+			this.webservice.tasks.get({}, function(error, tasks) {
 				assert.strictEqual(tasks.length, 4);
-				done();
+				done(error);
 			});
 		});
 

test/integration/route/result/download.js

@@ -21,12 +21,12 @@ const assert = require('proclaim');
 describe('GET /<task-id>/<result-id>.csv', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001.csv',
 			nonDom: true
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -42,13 +42,13 @@ describe('GET /<task-id>/<result-id>.csv', function() {
 describe('GET /<task-id>/<result-id>.json', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001.json',
 			nonDom: true,
 			json: true
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {

test/integration/route/result/index.js

@@ -21,11 +21,11 @@ const assert = require('proclaim');
 describe('GET /<task-id>/<result-id>', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {

test/integration/route/task/delete.js

@@ -21,11 +21,11 @@ const assert = require('proclaim');
 describe('GET /<task-id>/delete', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/delete'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -48,11 +48,11 @@ describe('GET /<task-id>/delete', function() {
 describe('POST /<task-id>/delete', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'POST',
 			endpoint: '/abc000000000000000000001/delete'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -60,8 +60,8 @@ describe('POST /<task-id>/delete', function() {
 	});
 
 	it('should delete the task', function(done) {
-		this.webservice.task('abc000000000000000000001').get({}, function(err) {
+		this.webservice.task('abc000000000000000000001').get({}, function(error) {
-			assert.strictEqual(err.message, 'Error 404');
+			assert.strictEqual(error.message, 'Error 404');
 			done();
 		});
 	});

test/integration/route/task/edit.js

@@ -21,11 +21,11 @@ const assert = require('proclaim');
 describe('GET /<task-id>/edit', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/edit'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -71,6 +71,11 @@ describe('GET /<task-id>/edit', function() {
 			assert.strictEqual(field.attr('value'), '0');
 		});
 
+		it('should have an "actions" field', function() {
+			const field = this.form.find('textarea[name=actions]').eq(0);
+			assert.isDefined(field);
+		});
+
 		it('should have a disabled "standard" field', function() {
 			const field = this.form.find('select[name=standard]').eq(0);
 			assert.isDefined(field);
@@ -116,7 +121,7 @@ describe('GET /<task-id>/edit', function() {
 describe('POST /<task-id>/edit', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'POST',
 			endpoint: '/abc000000000000000000001/edit',
 			form: {
@@ -126,7 +131,7 @@ describe('POST /<task-id>/edit', function() {
 				ignore: ['bar', 'baz']
 			}
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -134,12 +139,12 @@ describe('POST /<task-id>/edit', function() {
 	});
 
 	it('should edit the task', function(done) {
-		this.webservice.task('abc000000000000000000001').get({}, function(err, task) {
+		this.webservice.task('abc000000000000000000001').get({}, function(error, task) {
 			assert.strictEqual(task.name, 'foo');
 			assert.strictEqual(task.username, 'newuser');
 			assert.strictEqual(task.password, 'secure');
 			assert.deepEqual(task.ignore, ['bar', 'baz']);
-			done();
+			done(error);
 		});
 	});
 

test/integration/route/task/index.js

@@ -23,11 +23,11 @@ describe('GET /<task-id>', function() {
 	describe('when task has results', function() {
 
 		beforeEach(function(done) {
-			const req = {
+			const request = {
 				method: 'GET',
 				endpoint: '/abc000000000000000000001'
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -82,11 +82,11 @@ describe('GET /<task-id>', function() {
 	describe('when task has no results', function() {
 
 		beforeEach(function(done) {
-			const req = {
+			const request = {
 				method: 'GET',
 				endpoint: '/abc000000000000000000003'
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {

test/integration/route/task/run.js

@@ -21,11 +21,11 @@ const assert = require('proclaim');
 describe('GET /<task-id>/run', function() {
 
 	beforeEach(function(done) {
-		const req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/run'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {

test/integration/setup.js

@@ -40,8 +40,8 @@ afterEach(function(done) {
 
 // Check that the test application is running, and exit if not
 function assertTestAppIsRunning(url, done) {
-	request(url, err => {
+	request(url, error => {
-		if (err) {
+		if (error) {
 			console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`');
 			process.exit(1);
 		}

view/500.html

@@ -19,7 +19,7 @@ along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 	<p class="h2">Let's see what we can do here:</h2>
 	<ul>
 		<li>Do you have <a href="https://www.mongodb.com/">MongoDB</a> installed and <code>mongod</code> running?</li>
-		<li>Check out the <a href="https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md">Troubleshooting doc</a> for more information.</li>
+		<li>Check out the <a href="https://github.com/pa11y/dashboard/blob/master/README.md#troubleshooting">Troubleshooting guide</a> for more information.</li>
 		<li>Search for a related <a href="https://github.com/pa11y/dashboard/issues">Github issue</a>, or open one yourself.</li>
 	</ul>
 	{{#if error}}

view/helper/conditionals.js

@@ -0,0 +1,27 @@
+// This file is part of Pa11y Dashboard.
+//
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Pa11y Dashboard is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
+'use strict';
+
+module.exports = helper;
+
+function helper(hbs) {
+	// Compare if one value is greater than another
+	hbs.registerHelper('ifgtr', function(conditional, condition, options) {
+		if (conditional > condition) {
+			// eslint-disable-next-line no-invalid-this
+			return options.fn(this);
+		}
+	});
+}

view/helper/date.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 const moment = require('moment');

view/helper/url.js

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 module.exports = helper;