Version 1.9.0

The message is sometimes specific, so point out it's the first result.

.jscsrc

@@ -0,0 +1,88 @@
+{
+	"disallowEmptyBlocks": true,
+	"disallowImplicitTypeConversion": [
+		"binary",
+		"numeric",
+		"string"
+	],
+	"disallowKeywordsOnNewLine": [
+		"catch",
+		"else"
+	],
+	"disallowMixedSpacesAndTabs": true,
+	"disallowMultipleSpaces": true,
+	"disallowMultipleVarDecl": true,
+	"disallowNewlineBeforeBlockStatements": true,
+	"disallowQuotedKeysInObjects": true,
+	"disallowSpaceAfterObjectKeys": true,
+	"disallowSpaceAfterPrefixUnaryOperators": true,
+	"disallowSpaceBeforeComma": true,
+	"disallowSpaceBeforeSemicolon": true,
+	"disallowSpacesInCallExpression": true,
+	"disallowSpacesInFunction": {
+		"beforeOpeningRoundBrace": true
+	},
+	"disallowSpacesInsideArrayBrackets": true,
+	"disallowSpacesInsideBrackets": true,
+	"disallowSpacesInsideObjectBrackets": true,
+	"disallowSpacesInsideParentheses": true,
+	"disallowTrailingComma": true,
+	"disallowTrailingWhitespace": true,
+	"disallowYodaConditions": true,
+	"maximumLineLength": 200,
+	"requireBlocksOnNewline": true,
+	"requireCapitalizedConstructors": true,
+	"requireCommaBeforeLineBreak": true,
+	"requireCurlyBraces": [
+		"if",
+		"else",
+		"for",
+		"while",
+		"do",
+		"switch",
+		"try",
+		"catch"
+	],
+	"requireDotNotation": 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
+	},
+	"validateIndentation": "\t",
+	"validateLineBreaks": "LF",
+	"validateNewlineAfterArrayElements": true,
+	"validateParameterSeparator": ", ",
+	"validateQuoteMarks": "'",
+
+	"excludeFiles": [
+		"coverage",
+		"node_modules",
+		"public/js"
+	]
+}

.jshintignore

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

.jshintrc

@@ -0,0 +1,29 @@
+{
+	"browser": true,
+	"curly": true,
+	"eqeqeq": true,
+	"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,
+	"regexp": true,
+	"shadow": true,
+	"strict": true,
+	"sub": true,
+	"trailing": true,
+	"undef": true,
+	"unused": true
+}

.travis.yml

@@ -1,8 +1,18 @@
 
 # Language/versions
 language: node_js
-node_js:
+matrix:
-  - "0.10"
+  include:
+
+    # Run tests in Node.js 0.10 (unsupported)
+    - node_js: '0.10'
+
+    # Run tests in Node.js 0.12
+    - node_js: '0.12'
+
+  # Allow Node.js 0.10 to fail – it's unsupported
+  allow_failures:
+    - node_js: '0.10'
 
 # Build only master (and pull-requests)
 branches:
@@ -15,15 +25,7 @@ services:
 
 # Build script
 before_script:
-  - npm install -g grunt-cli
   - cp config/test.sample.json config/test.json
-  - grunt start-test &
+  - NODE_ENV=test node index.js &
   - sleep 5 # give server time to start
-script: 'grunt ci'
+script: 'make ci'
-
-# Notifications
-notifications:
- email:
-   - j.robinson@nature.com
-   - perry.harlock@nature.com
-   - rowan.manning@nature.com

CONTRIBUTING.md

@@ -1,53 +0,0 @@
-
-How To Contribute
-=================
-
-pa11y-dashboard accepts contributions from anyone, as long as you follow the guidelines below. If you'd like to contribute but aren't sure what there is for you to do, check the issue tracker for [things ready to be worked on][ready] and [known bugs][bugs].
-
-It might be an idea to focus efforts on the goal of the [next milestone][milestones] before jumping onto anything too far ahead on the roadmap.
-
-
-Features
---------
-
-We won't accept features without prior discussion in the [issue tracker][issues]. Two heads are always better than one – this blanket rule stops you from spending your valuable time on features which may not make it back into pa11y-dashboard.
-
-If you want to fork the project and build on it by yourself, of course that's absolutely fine! Just don't expect your code to me merged back upstream :)
-
-
-Refactoring/Rewriting
----------------------
-
-We will accept refactors where it makes an improvement to the maintainability of the code-base or makes code more readable/understandable. If there's an argument about what's readable or not, chat about it in a pull-request.
-
-
-Coding Guidelines
------------------
-
-* No trailing whitespace please (except in Markdown)
-* Generally follow the style that is currently present in the code – consistency is important
-* Keep indentation consistent (tabs)
-* Don't commit code with lint errors (run `grunt lint` to run JSHint with the correct configurations)
-* Don't commit code without passing tests (run `grunt test`).
-
-
-Versioning
-----------
-
-We use [Semantic Versioning][semver] in this project. The process for releasing a new version is as follows; this should only be done by core contributors – you don't need to include a tagged version in your pull-requests.
-
-* Switch to `master` and merge the `develop` branch into it
-* Update the version number in `package.json` and `README.md`
-* Commit the changes with the message: "Version x.x.x" (x.x.x being the new version number)
-* Tag the commit with the version number (just the numbers, no "version" or "v"): `git tag x.x.x`
-* Push with tags: `git push && git push --tags`
-* Check out the `develop` branch, merge `master` into it, and push
-* On GitHub, add [release notes][release-notes] for the new version. The title should be "Version x.x.x", and the description should be a list of new features/fixes
-
-
-[bugs]: https://github.com/nature/pa11y-dashboard/issues?labels=bug&state=open
-[ready]: https://github.com/nature/pa11y-dashboard/issues?labels=ready&state=open
-[issues]: https://github.com/nature/pa11y-dashboard/issues
-[milestones]: https://github.com/nature/pa11y-dashboard/issues/milestones
-[release-notes]: https://github.com/nature/pa11y-dashboard/releases
-[semver]: http://semver.org/

Gruntfile.js

@@ -1,134 +0,0 @@
-// 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/>.
-
-module.exports = function (grunt) {
-
-	grunt.initConfig({
-
-		jshint: {
-			all: [
-				'**/*.js',
-				'!node_modules/**/*.js',
-				'!public/js/vendor/**/*.js',
-				'!public/js/site.min.js'
-			],
-			options: {
-				es3: false,
-				indent: 4,
-				latedef: false,
-				maxcomplexity: 6,
-				maxdepth: 2,
-				maxlen: 100,
-				maxparams: 4,
-				maxstatements: false,
-				node: true,
-				quotmark: 'single'
-			}
-		},
-
-		less: {
-			all: {
-				options: {
-					cleancss: true
-				},
-				files: {
-					'public/css/site.min.css': 'public/less/main.less'
-				}
-			}
-		},
-
-		mochaTest: {
-			functional: {
-				src: ['test/functional/**/*.js'],
-				options: {
-					reporter: 'spec',
-					timeout: 4000
-				}
-			}
-		},
-
-		nodemon: {
-			development: {
-				options: {
-					cwd: __dirname,
-					file: 'index.js',
-					env: {
-						NODE_ENV: 'development'
-					}
-				}
-			},
-			test: {
-				options: {
-					cwd: __dirname,
-					file: 'index.js',
-					env: {
-						NODE_ENV: 'test'
-					}
-				}
-			}
-		},
-
-		uglify: {
-			options: {
-				mangle: false
-			},
-			all: {
-				files: {
-					'public/js/site.min.js': [
-						'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/flot/jquery.flot.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/site.js'
-					]
-				}
-			}
-		},
-
-		watch: {
-			less: {
-				files: ['public/less/**/*.less'],
-				tasks: ['less']
-			},
-			js: {
-				files: ['public/js/**/*.js', '!public/js/site.min.js'],
-				tasks: ['uglify']
-			}
-		}
-
-	});
-
-	grunt.loadNpmTasks('grunt-contrib-jshint');
-	grunt.loadNpmTasks('grunt-contrib-less');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-contrib-watch');
-	grunt.loadNpmTasks('grunt-mocha-test');
-	grunt.loadNpmTasks('grunt-nodemon');
-
-	grunt.registerTask('lint', ['jshint']);
-	grunt.registerTask('test', ['mochaTest']);
-	grunt.registerTask('compile', ['less', 'uglify']);
-	grunt.registerTask('start', ['nodemon:development']);
-	grunt.registerTask('start-test', ['nodemon:test']);
-	grunt.registerTask('default', ['compile', 'lint', 'test']);
-	grunt.registerTask('ci', ['lint', 'test']);
-
-};

Makefile

@@ -0,0 +1,59 @@
+
+# Color helpers
+C_CYAN=\x1b[34;01m
+C_RESET=\x1b[0m
+
+# Group targets
+all: deps lint test
+ci: lint test
+
+# Install dependencies
+deps:
+	@echo "$(C_CYAN)> installing dependencies$(C_RESET)"
+	@npm install
+
+# Lint JavaScript
+lint: jshint jscs
+
+# Run JSHint
+jshint:
+	@echo "$(C_CYAN)> linting javascript$(C_RESET)"
+	@./node_modules/.bin/jshint .
+
+# Run JavaScript Code Style
+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)"
+	@./node_modules/.bin/lessc -x ./public/less/main.less ./public/css/site.min.css
+
+# Compile client-side JavaScript
+uglify:
+	@echo "$(C_CYAN)> compiling client-side JavaScript$(C_RESET)"
+	@./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/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/site.js \
+		-o ./public/js/site.min.js
+
+.PHONY: test

README.md

@@ -3,7 +3,7 @@ pa11y-dashboard
 
 pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down.
 
-**Current Version:** *1.7.0*  
+**Current Version:** *1.9.0*  
 **Build Status:** [![Build Status][travis-img]][travis]  
 **Node Version Support:** *0.10*
 
@@ -22,9 +22,9 @@ You'll then need to clone this repo locally and install dependencies with `npm i
 Once you have a local clone, you'll need to copy some sample configuration files in order to run the application. From within the repo, run the following commands:
 
 ```sh
-$ cp config/development.sample.json config/development.json
+cp config/development.sample.json config/development.json
-$ cp config/production.sample.json config/production.json
+cp config/production.sample.json config/production.json
-$ cp config/test.sample.json config/test.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 configurations. The [available configurations are documented here](#configurations).
@@ -32,9 +32,9 @@ Each of these files defines configurations for a different environment. If you'r
 Now that you've got your application configured, you can run in each mode with the following commands:
 
 ```sh
-$ NODE_ENV=production node .   # Run in production
+NODE_ENV=production node index.js   # Run in production
-$ NODE_ENV=development node .  # Run in development
+NODE_ENV=development node index.js  # Run in development
-$ NODE_ENV=test node .         # Run in test
+NODE_ENV=test node index.js         # Run in test
 ```
 
 Check the [development instructions](#development) for more information about running locally (and restarting automatically when files change).
@@ -64,46 +64,46 @@ This can either be an object containing [pa11y-webservice configurations][pa11y-
 Development
 -----------
 
-To develop pa11y-dashboard, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup). You'll also need [Grunt][grunt] to be installed globally in order to run tests, you can do this with `npm install -g grunt-cli`.
+To develop pa11y-dashboard, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup).
 
-Once you've done this, you'll need to start the application in test mode with:
+You'll need to start the application in test mode with:
 
 ```sh
-$ grunt start-test
+NODE_ENV=test node index.js
 ```
 
 Now you'll be able to run the following commands:
 
 ```sh
-$ grunt             # Run the lint and test tasks together
+make       # Run the lint and test tasks together
-$ grunt lint        # Run JSHint with the correct config
+make lint  # Run linters with the correct config
-$ grunt compile     # Compile front-end assets
+make test  # Run integration tests
-$ grunt start       # Run app in development mode, restarting if files change
-$ grunt start-test  # Run app in test mode, restarting if files change
-$ grunt test        # Run functional tests
-$ grunt watch       # Watch for file changes and compile assets
 ```
 
 Code with lint errors or failing tests will not be accepted, please use the build tools outlined above.
 
-For users with push-access, don't commit to the master branch. Code should be in `develop` until it's ready to be released.
+To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository.
+
+```sh
+make css     # Compile the site CSS from LESS files
+make uglify  # Compile and uglify the client-side JavaScript
+```
 
 
 License
 -------
 
-[Copyright 2013 Nature Publishing Group](LICENSE.txt).  
+[Copyright 2013 Springer Nature](LICENSE.txt).  
 pa11y-dashboard is licensed under the [GNU General Public License 3.0][gpl].
 
 
 
 [gpl]: http://www.gnu.org/licenses/gpl-3.0.html
-[grunt]: http://gruntjs.com/
 [mongo]: http://www.mongodb.org/
 [node]: http://nodejs.org/
-[pa11y]: https://github.com/nature/pa11y
+[pa11y]: https://github.com/springernature/pa11y
-[pa11y-webservice]: https://github.com/nature/pa11y-webservice
+[pa11y-webservice]: https://github.com/springernature/pa11y-webservice
-[pa11y-webservice-config]: https://github.com/nature/pa11y-webservice#configurations
+[pa11y-webservice-config]: https://github.com/springernature/pa11y-webservice#configurations
 [phantom]: http://phantomjs.org/
-[travis]: https://travis-ci.org/nature/pa11y-dashboard
+[travis]: https://travis-ci.org/springernature/pa11y-dashboard
-[travis-img]: https://travis-ci.org/nature/pa11y-dashboard.png?branch=master
+[travis-img]: https://travis-ci.org/springernature/pa11y-dashboard.png?branch=master

app.js

@@ -29,7 +29,7 @@ function initApp (config, callback) {
 	config = defaultConfig(config);
 
 	var webserviceUrl = config.webservice;
-	if (typeof webserviceUrl == 'object') {
+	if (typeof webserviceUrl === 'object') {
 		webserviceUrl = 'http://' + webserviceUrl.host + ':' + webserviceUrl.port + '/';
 	}
 
@@ -58,7 +58,7 @@ function initApp (config, callback) {
 		contentHelperName: 'content',
 		layoutsDir: __dirname + '/view/layout',
 		partialsDir: __dirname + '/view/partial',
-		defaultLayout: __dirname + '/view/layout/default',
+		defaultLayout: __dirname + '/view/layout/default'
 	}));
 	app.express.set('view engine', 'html');
 

data/standards.js

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-/* jshint maxlen: false */
+// jscs:disable maximumLineLength
 'use strict';
 
 module.exports = getStandards;
@@ -656,10 +656,12 @@ function getStandards () {
 				{
 					name: 'WCAG2AA.Principle1.Guideline1_1.1_1_1.H30.2',
 					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: 'WCAG2AA.Principle1.Guideline1_1.1_1_1.H37',
 					description: 'Img element missing an alt attribute. Use the alt attribute to specify a short text alternative.'
-				},          {
+				},
+				{
 					name: 'WCAG2AA.Principle1.Guideline1_1.1_1_1.H67.1',
 					description: 'Img element with empty alt text must have absent or empty title attribute.'
 				},

index.js

@@ -18,6 +18,11 @@
 var chalk = require('chalk');
 var config = require('./config/' + (process.env.NODE_ENV || 'development') + '.json');
 
+process.on('SIGINT', function() {
+	console.log('\nGracefully shutting down from SIGINT (Ctrl-C)');
+	process.exit();
+});
+
 require('./app')(config, function(err, app) {
 
 	console.log('');

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pa11y-dashboard",
-	"version": "1.7.0",
+	"version": "1.9.0",
 	"private": true,
 
 	"description": "pa11y-dashboard is a visual web interface to the pa11y accessibility reporter",
@@ -12,10 +12,10 @@
 
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/nature/pa11y-dashboard.git"
+		"url": "https://github.com/springernature/pa11y-dashboard.git"
 	},
-	"homepage": "https://github.com/nature/pa11y-dashboard",
+	"homepage": "https://github.com/springernature/pa11y-dashboard",
-	"bugs": "https://github.com/nature/pa11y-dashboard/issues",
+	"bugs": "https://github.com/springernature/pa11y-dashboard/issues",
 
 	"engines": {
 		"node": ">=0.10"
@@ -25,25 +25,24 @@
 		"express": "~3.4",
 		"express-hbs": "~0.2",
 		"moment": "~2.2",
-		"pa11y-webservice": "~1.6",
+		"pa11y-webservice": "~1.8",
 		"pa11y-webservice-client-node": "~1.1",
 		"underscore": "~1.5"
 	},
 	"devDependencies": {
 		"bower": "~1.2",
-		"grunt": "~0.4",
+		"jscs": "^2",
-		"grunt-contrib-jshint": "~0.7",
+		"jsdom": "^3",
-		"grunt-contrib-less": "~0.8",
+		"jshint": "^2",
-		"grunt-contrib-uglify": "~0.2",
+		"less": "~1.5",
-		"grunt-contrib-watch": "~0.5",
+		"mocha": "^2",
-		"grunt-mocha-test": "~0.7",
+		"proclaim": "^3",
-		"grunt-nodemon": "~0.1",
+		"request": "~2.27",
-		"jsdom": "~0.8",
+		"uglify-js": "~2.4"
-		"proclaim": "~2.0",
-		"request": "~2.27"
 	},
 
 	"scripts": {
-		"start": "node ."
+		"start": "node index.js",
+		"test": "make ci"
 	}
 }

public/js/site.js

@@ -24,9 +24,11 @@ $(document).ready(function(){
     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 graphOptions = {
         series: {
+            dashes: { show: false, lineWidth: 3 },
             lines: { show: true },
             points: { show: true },
             hoverable: true
@@ -43,6 +45,12 @@ $(document).ready(function(){
         lines: {
             lineWidth: 3
         },
+        points: {
+            fill: true,
+            radius:4,
+            lineWidth:3
+        },
+        shadowSize: 0,
         grid: {
             backgroundColor: '#fff',
             borderColor: '#808080',
@@ -60,6 +68,11 @@ $(document).ready(function(){
         }
     };
 
+    // have we declared a custom legend
+    if (legend.length === 1) {
+        $('body').addClass('custom-legend');
+    }
+
     // Toggle appearance of lists of error/warnings/notices
     expandLink.click( function(){
 		$(this).next().slideToggle('slow', function(){});
@@ -168,9 +181,25 @@ $(document).ready(function(){
 
     function getData() {
         return [
-            { color: 'rgb(216, 61, 45)', label: 'Errors', data:  data.error },
+            {
-            { color: 'rgb(168, 103, 0)', label: 'Warnings', data:  data.warning  },
+                color: 'rgb(216, 61, 45)',
-            { color: 'rgb(23, 123, 190)', label: 'Notices', data:  data.notice }
+                label: 'Errors',
+                data: data.error
+            },
+            {
+                color: 'rgb(168, 103, 0)',
+                label: 'Warnings',
+                data: data.warning,
+                lines: { show: false },
+                dashes: { show: true, dashLength: [10, 5] }
+            },
+            {
+                color: 'rgb(23, 123, 190)',
+                label: 'Notices',
+                data: data.notice,
+                lines: { show: false },
+                dashes: { show: true, dashLength: 5 }
+            }
         ];
     }
 
@@ -225,13 +254,25 @@ $(document).ready(function(){
 
     function plotAccordingToChoices() {
         var data = [];
+        var labels = [];
         choiceContainer.find('input:checked').each(function () {
             var key = $(this).attr('name');
             if (key && datasets[key]) {
+                labels.push(datasets[key].label);
                 data.push(datasets[key]);
             }
         });
 
+        if (labels.length && legend.length === 1) {
+            legend.find('tr').hide();
+            $.each(labels, function (index, value) {
+                $('.legend' + value).parents('tr').show();
+            });
+            legend.show();
+        } else {
+            legend.hide();
+        }
+
         if (data.length > -1) {
             $.plot(graphContainer, data, graphOptions);
         }

public/js/vendor/flot/jquery.flot.dashes.js

@@ -0,0 +1,228 @@
+/*
+ * jQuery.flot.dashes
+ *
+ * options = {
+ *   series: {
+ *     dashes: {
+ *
+ *       // show
+ *       // default: false
+ *       // Whether to show dashes for the series.
+ *       show: <boolean>,
+ *
+ *       // lineWidth
+ *       // default: 2
+ *       // The width of the dashed line in pixels.
+ *       lineWidth: <number>,
+ *
+ *       // dashLength
+ *       // default: 10
+ *       // Controls the length of the individual dashes and the amount of
+ *       // space between them.
+ *       // If this is a number, the dashes and spaces will have that length.
+ *       // If this is an array, it is read as [ dashLength, spaceLength ]
+ *       dashLength: <number> or <array[2]>
+ *     }
+ *   }
+ * }
+ */
+(function($){
+
+  function init(plot) {
+    plot.hooks.drawSeries.push(function(plot, ctx, series) {
+      if (!series.dashes.show) return;
+
+      var plotOffset = plot.getPlotOffset(),
+          axisx = series.xaxis,
+          axisy = series.yaxis;
+
+      function plotDashes(xoffset, yoffset) {
+
+        var points = series.datapoints.points,
+            ps = series.datapoints.pointsize,
+            prevx = null,
+            prevy = null,
+            dashRemainder = 0,
+            dashOn = true,
+            dashOnLength,
+            dashOffLength;
+
+        if (series.dashes.dashLength[0]) {
+          dashOnLength = series.dashes.dashLength[0];
+          if (series.dashes.dashLength[1]) {
+            dashOffLength = series.dashes.dashLength[1];
+          } else {
+            dashOffLength = dashOnLength;
+          }
+        } else {
+          dashOffLength = dashOnLength = series.dashes.dashLength;
+        }
+
+        ctx.beginPath();
+
+        for (var i = ps; i < points.length; i += ps) {
+
+          var x1 = points[i - ps],
+              y1 = points[i - ps + 1],
+              x2 = points[i],
+              y2 = points[i + 1];
+
+          if (x1 == null || x2 == null) continue;
+
+          // clip with ymin
+          if (y1 <= y2 && y1 < axisy.min) {
+            if (y2 < axisy.min) continue;   // line segment is outside
+            // compute new intersection point
+            x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+            y1 = axisy.min;
+          } else if (y2 <= y1 && y2 < axisy.min) {
+            if (y1 < axisy.min) continue;
+            x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+            y2 = axisy.min;
+          }
+
+          // clip with ymax
+          if (y1 >= y2 && y1 > axisy.max) {
+            if (y2 > axisy.max) continue;
+            x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+            y1 = axisy.max;
+          } else if (y2 >= y1 && y2 > axisy.max) {
+            if (y1 > axisy.max) continue;
+            x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+            y2 = axisy.max;
+          }
+
+          // clip with xmin
+          if (x1 <= x2 && x1 < axisx.min) {
+            if (x2 < axisx.min) continue;
+            y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+            x1 = axisx.min;
+          } else if (x2 <= x1 && x2 < axisx.min) {
+            if (x1 < axisx.min) continue;
+            y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+            x2 = axisx.min;
+          }
+
+          // clip with xmax
+          if (x1 >= x2 && x1 > axisx.max) {
+            if (x2 > axisx.max) continue;
+            y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+            x1 = axisx.max;
+          } else if (x2 >= x1 && x2 > axisx.max) {
+            if (x1 > axisx.max) continue;
+            y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+            x2 = axisx.max;
+          }
+
+          if (x1 != prevx || y1 != prevy) {
+            ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
+          }
+
+          var ax1 = axisx.p2c(x1) + xoffset,
+              ay1 = axisy.p2c(y1) + yoffset,
+              ax2 = axisx.p2c(x2) + xoffset,
+              ay2 = axisy.p2c(y2) + yoffset,
+              dashOffset;
+
+          function lineSegmentOffset(segmentLength) {
+
+            var c = Math.sqrt(Math.pow(ax2 - ax1, 2) + Math.pow(ay2 - ay1, 2));
+
+            if (c <= segmentLength) {
+              return {
+                deltaX: ax2 - ax1,
+                deltaY: ay2 - ay1,
+                distance: c,
+                remainder: segmentLength - c
+              }
+            } else {
+              var xsign = ax2 > ax1 ? 1 : -1,
+                  ysign = ay2 > ay1 ? 1 : -1;
+              return {
+                deltaX: xsign * Math.sqrt(Math.pow(segmentLength, 2) / (1 + Math.pow((ay2 - ay1)/(ax2 - ax1), 2))),
+                deltaY: ysign * Math.sqrt(Math.pow(segmentLength, 2) - Math.pow(segmentLength, 2) / (1 + Math.pow((ay2 - ay1)/(ax2 - ax1), 2))),
+                distance: segmentLength,
+                remainder: 0
+              };
+            }
+          }
+          //-end lineSegmentOffset
+
+          do {
+
+            dashOffset = lineSegmentOffset(
+                dashRemainder > 0 ? dashRemainder :
+                  dashOn ? dashOnLength : dashOffLength);
+
+            if (dashOffset.deltaX != 0 || dashOffset.deltaY != 0) {
+              if (dashOn) {
+                ctx.lineTo(ax1 + dashOffset.deltaX, ay1 + dashOffset.deltaY);
+              } else {
+                ctx.moveTo(ax1 + dashOffset.deltaX, ay1 + dashOffset.deltaY);
+              }
+            }
+
+            dashOn = !dashOn;
+            dashRemainder = dashOffset.remainder;
+            ax1 += dashOffset.deltaX;
+            ay1 += dashOffset.deltaY;
+
+          } while (dashOffset.distance > 0);
+
+          prevx = x2;
+          prevy = y2;
+        }
+
+        ctx.stroke();
+      }
+      //-end plotDashes
+
+      ctx.save();
+      ctx.translate(plotOffset.left, plotOffset.top);
+      ctx.lineJoin = 'round';
+
+      var lw = series.dashes.lineWidth,
+          sw = series.shadowSize;
+
+      // FIXME: consider another form of shadow when filling is turned on
+      if (lw > 0 && sw > 0) {
+        // draw shadow as a thick and thin line with transparency
+        ctx.lineWidth = sw;
+        ctx.strokeStyle = "rgba(0,0,0,0.1)";
+        // position shadow at angle from the mid of line
+        var angle = Math.PI/18;
+        plotDashes(Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2));
+        ctx.lineWidth = sw/2;
+        plotDashes(Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4));
+      }
+
+      ctx.lineWidth = lw;
+      ctx.strokeStyle = series.color;
+
+      if (lw > 0) {
+        plotDashes(0, 0);
+      }
+
+      ctx.restore();
+
+    });
+    //-end draw hook
+  }
+  //-end init
+
+  $.plot.plugins.push({
+    init: init,
+    options: {
+      series: {
+        dashes: {
+          show: false,
+          lineWidth: 2,
+          dashLength: 10
+        }
+      }
+    },
+    name: 'dashes',
+    version: '0.1'
+  });
+
+})(jQuery)

public/less/code.less

@@ -17,7 +17,6 @@ code {
   font-size: 90%;
   color: @code-color;
   background-color: @code-bg;
-  white-space: nowrap;
   border-radius: @border-radius-base;
 }
 

public/less/site.less

@@ -429,8 +429,7 @@ ul.date-links {
 	}
 }
 .btn-reset {
-	margin-top:-24px;
+	margin-top:12px;
-	margin-right:35px
 }
 .flot-x-axis {
 	.flot-tick-label {
@@ -440,6 +439,68 @@ ul.date-links {
 .tooltip-graph {
 	font-size:12px;
 }
+.custom-legend .legend {
+	display:none !important;
+}
+.dashedLegend {
+	position:absolute;
+	top:17px;
+	right:40px;
+	font-size:smaller;
+	color:#545454;
+	background-color: #fff;
+	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;
+	border-width: 3px 0px 0px;
+	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;
+}
 
 /* New task page */
 .standards-lists {

route/result/download.js

@@ -61,12 +61,14 @@ function route (app) {
 	app.express.get('/:id/:rid.csv', getTaskAndResult, function(req, res) {
 		var task = res.locals.task;
 		var result = res.locals.result;
-        var rows = ['"code","message","type"'];
+		var rows = ['"code","message","type","context","selector"'];
 		result.results.forEach(function(msg) {
 			rows.push([
 				JSON.stringify(msg.code),
 				JSON.stringify(msg.message),
-                JSON.stringify(msg.type)
+				JSON.stringify(msg.type),
+				JSON.stringify(msg.context),
+				JSON.stringify(msg.selector)
 			].join(','));
 		});
 		res.attachment(getDownloadFileName(task, result, 'csv'));

route/task/delete.js

@@ -15,7 +15,6 @@
 
 'use strict';
 
-var _ = require('underscore');
 var presentTask = require('../../view/presenter/task');
 
 module.exports = route;

route/task/edit.js

@@ -15,7 +15,6 @@
 
 'use strict';
 
-var _ = require('underscore');
 var presentTask = require('../../view/presenter/task');
 var getStandards = require('../../data/standards');
 

route/task/ignore.js

@@ -1,9 +1,5 @@
 'use strict';
 
-var _ = require('underscore');
-var presentTask = require('../../view/presenter/task');
-var getStandards = require('../../data/standards');
-
 module.exports = route;
 
 // Route definition

route/task/run.js

@@ -21,7 +21,7 @@ module.exports = route;
 function route(app) {
 
 	app.express.get('/:id/run', function(req, res, next) {
-		app.webservice.task(req.params.id).run(function (err, task) {
+		app.webservice.task(req.params.id).run(function(err) {
 			if (err) {
 				return next();
 			}

route/task/unignore.js

@@ -1,9 +1,5 @@
 'use strict';
 
-var _ = require('underscore');
-var presentTask = require('../../view/presenter/task');
-var getStandards = require('../../data/standards');
-
 module.exports = route;
 
 // Route definition

test/integration/helper/webservice.js

@@ -22,7 +22,7 @@ module.exports = createWebserviceClient;
 // Create a webservice client
 function createWebserviceClient(config) {
 	var webserviceUrl = config.webservice;
-	if (typeof webserviceUrl == 'object') {
+	if (typeof webserviceUrl === 'object') {
 		webserviceUrl = 'http://' + webserviceUrl.host + ':' + webserviceUrl.port + '/';
 	}
 	return createClient(webserviceUrl);

test/integration/route/index.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/route/new.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/route/result/download.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/route/result/index.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/route/task/delete.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/route/task/edit.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');
@@ -132,4 +130,3 @@ describe('POST /<task-id>/edit', function () {
 	});
 
 });
-

test/integration/route/task/index.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/route/task/run.js

@@ -13,8 +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/>.
 
-/* global beforeEach, describe, it */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var assert = require('proclaim');

test/integration/setup.js

@@ -13,8 +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/>.
 
-/* global afterEach, before */
-/* jshint maxlen: false, maxstatements: false */
 'use strict';
 
 var config = require('../../config/test.json');
@@ -43,7 +41,7 @@ afterEach(function (done) {
 function assertTestAppIsRunning(url, done) {
 	request(url, function(err) {
 		if (err) {
-			console.error('Error: Test app not started; run with `grunt start-test`');
+			console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`');
 			process.exit(1);
 		}
 		done();

view/new.html

@@ -92,7 +92,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
-	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
+	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/springernature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">
 		{{#standards}}

view/partial/graph.html

@@ -15,11 +15,43 @@ You should have received a copy of the GNU General Public License
 along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <div class="col-md-12 clearfix">
-	<div class="graph-container graph-spacer ruled">
+	<div class="graph-container graph-spacer ruled clearfix">
 		<div data-role="graph" class="graph"></div>
 		<div class="row">
 			<ul class="list-unstyled floated-list series-checkboxes clearfix crunch-bottom col-md-3 col-sm-6 col-xs-12 pull-right" data-role="series-checkboxes"></ul>
 		</div>
+		<div class="dashedLegend">
+			<div class="dashedContainer">
+			    <table>
+			        <tbody>
+			            <tr>
+			                <td class="legendColorBox">
+			                    <div class="clearfix legendIcon legendErrors">
+			                        <div></div>
+			                    </div>
+			                </td>
+			                <td class="legendLabel">Errors</td>
+			            </tr>
+			            <tr>
+			                <td class="legendColorBox">
+			                    <div class="clearfix legendIcon legendWarnings">
+			                        <div></div><div></div>
+			                    </div>
+			                </td>
+			                <td class="legendLabel">Warnings</td>
+			            </tr>
+			            <tr>
+			                <td class="legendColorBox">
+			                    <div class="clearfix legendIcon legendNotices">
+			                        <div></div><div></div><div></div>
+			                    </div>
+			                </td>
+			                <td class="legendLabel">Notices</td>
+			            </tr>
+			        </tbody>
+			    </table>
+			</div>
+		</div>
 		<button data-role='zoom-reset' class="btn btn-xs btn-primary pull-right btn-reset hidden">Reset Zoom <i class="glyphicon glyphicon-zoom-out"></i></button>
 	</div>
 </div>

view/partial/page-footer.html

@@ -18,7 +18,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 	<div class="footer" role="contentinfo">
 		<div class="container">
 			<div class="col-md-5">
-				<small>&copy; {{year}} Nature Publishing Group.<br/>pa11y dashboard is licensed under the GNU General Public License 3.0.<br/>Version {{version}}</small>
+				<small>&copy; {{year}} Springer Nature.<br/>pa11y dashboard is licensed under the GNU General Public License 3.0.<br/>Version {{version}}</small>
 			</div>
 			<div class="col-md-7 clearfix">
 				<ul class="crunch-bottom floated-list nav">

view/partial/result.html

@@ -82,7 +82,14 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 				{{#mainResult.errors}}
 					<li>
 						<p class="crunch rule-name">{{code}} <span class="badge">{{count}}</span></p>
-						<p>{{message}}</p>
+						<p><em>First result:</em> {{message}}</p>
+						<p>
+							<b>Selector:</b>
+							<code style="text-wrap:pre-wrap">{{#if selector}}{{selector}}{{else}}-{{/if}}</code>
+							<br/>
+							<b>Context:</b>
+							<code style="text-wrap:pre-wrap">{{#if context}}{{context}}{{else}}-{{/if}}</code>
+						</p>
 						{{#unless readonly}}
 							{{#if ../../isTaskPage}}
 								<form action="{{../../../task.hrefIgnore}}" method="post">
@@ -110,7 +117,14 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 				{{#mainResult.warnings}}
 					<li>
 						<p class="crunch rule-name">{{code}} <span class="badge">{{count}}</span></p>
-						<p>{{message}}</p>
+						<p><em>First result:</em> {{message}}</p>
+						<p>
+							<b>Selector:</b>
+							<code style="text-wrap:pre-wrap">{{#if selector}}{{selector}}{{else}}-{{/if}}</code>
+							<br/>
+							<b>Context:</b>
+							<code style="text-wrap:pre-wrap">{{#if context}}{{context}}{{else}}-{{/if}}</code>
+						</p>
 						{{#unless readonly}}
 							{{#if ../../isTaskPage}}
 								<form action="{{../../../task.hrefIgnore}}" method="post">
@@ -139,7 +153,14 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 				{{#mainResult.notices}}
 					<li>
 						<p class="crunch rule-name">{{code}} <span class="badge">{{count}}</span></p>
-						<p>{{message}}</p>
+						<p><em>First result:</em> {{message}}</p>
+						<p>
+							<b>Selector:</b>
+							<code style="text-wrap:pre-wrap">{{#if selector}}{{selector}}{{else}}-{{/if}}</code>
+							<br/>
+							<b>Context:</b>
+							<code style="text-wrap:pre-wrap">{{#if context}}{{context}}{{else}}-{{/if}}</code>
+						</p>
 						{{#unless readonly}}
 							{{#if ../../isTaskPage}}
 								<form action="{{../../../task.hrefIgnore}}" method="post">

view/presenter/task.js

@@ -15,7 +15,6 @@
 
 'use strict';
 
-var _ = require('underscore');
 var presentIgnoreRules = require('./ignore');
 var presentResult = require('./result');
 

view/task/edit.html

@@ -104,7 +104,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
-	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
+	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/springernature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">
 		{{#standards}}