Resolve conflicts

CONTRIBUTING.md

@@ -0,0 +1,38 @@
+
+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`).
+
+
+
+[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

Gruntfile.js

@@ -3,7 +3,12 @@ module.exports = function (grunt) {
 	grunt.initConfig({
 
 		jshint: {
-			all: ['**/*.js', '!node_modules/**/*.js', '!public/js/vendor/**/*.js', '!public/js/site.min.js'],
+			all: [
+				'**/*.js',
+				'!node_modules/**/*.js',
+				'!public/js/vendor/**/*.js',
+				'!public/js/site.min.js'
+			],
 			options: {
 				es3: false,
 				indent: 4,

app.js

@@ -51,8 +51,7 @@ function initApp (config, callback) {
 		year: (new Date()).getFullYear(),
 		version: pkg.version,
 		repo: pkg.homepage,
-		bugtracker: pkg.bugs,
-		rules: pkg.snifferules
+		bugtracker: pkg.bugs
 	});
 	app.express.use(function (req, res, next) {
 		res.locals.isHomePage = (req.path === '/');

package.json

@@ -16,7 +16,6 @@
 	},
 	"homepage": "https://github.com/nature/pa11y-dashboard",
 	"bugs": "https://github.com/nature/pa11y-dashboard/issues",
-	"snifferules": "https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules",
 
 	"engines": {
 		"node": ">=0.10"
@@ -26,7 +25,7 @@
 		"express": "~3.4",
 		"express-hbs": "~0.2",
 		"moment": "~2.2",
-		"pa11y-webservice-client-node": "git+ssh://git@github.com:nature/pa11y-webservice-client-node.git#1.0.0-beta.6",
+		"pa11y-webservice-client-node": "git+ssh://git@github.com:nature/pa11y-webservice-client-node.git#1.0.0-beta.7",
 		"underscore": "~1.5"
 	},
 	"devDependencies": {

public/less/bootswatch.less

@@ -2,8 +2,6 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Lato:400,700,900,400italic");
-
 // Navbar =====================================================================
 
 // Buttons ====================================================================

route/new.js

@@ -22,6 +22,7 @@ function route (app) {
 
 	app.express.post('/new', function (req, res) {
 		var newTask = {
+			name: req.body.name,
 			url: req.body.url,
 			standard: req.body.standard,
 			ignore: req.body.ignore || []

route/result/download.js

@@ -40,7 +40,7 @@ function route (app) {
             moment(result.date).format('YYYY-MM-DD'),
             '.',
             extension
-        ].join('')
+        ].join('');
     }
 
     app.express.get('/:id/:rid.csv', getTaskAndResult, function (req, res) {

view/layout/default.html

@@ -14,6 +14,7 @@
 	<!-- For mobile devices. -->
 	<meta name="viewport" content="width=device-width"/>
 
+	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:400,700,900,400italic"/>
 	<link rel="stylesheet" href="/css/site.min.css"/>
 
 </head>

view/new.html

@@ -18,11 +18,20 @@
 		</div>
 	{{/error}}
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-8 col-sm-8 col-xs-10">
+				<label class="control-label" for="new-task-name">Name</label>
+				<input class="form-control" id="new-task-name" type="text" placeholder="E.g. My Home Page" name="name" value="{{task.name}}"/>
+			</div>
+		</div>
+	</div>
+
 	<div class="form-group clearfix">
 		<div class="row">
 			<div class="col-md-8 col-sm-8 col-xs-10">
 				<label class="control-label" for="new-task-url">URL</label>
-				<input class="form-control" id="new-task-url" type="url" placeholder="URL" name="url" value="{{task.url}}"/>
+				<input class="form-control" id="new-task-url" type="url" placeholder="E.g. http://mysite.com/" name="url" value="{{task.url}}"/>
 			</div>
 		</div>
 	</div>

view/partial/page-footer.html

@@ -7,13 +7,13 @@
 			<div class="col-md-5 clearfix">
 				<ul class="crunch-bottom floated-list nav">
 					<li>
-						<a href="{{repo}}">github repo</a>
+						<a href="{{repo}}">GitHub Repo</a>
 					</li>
 					<li>
-						<a href="{{bugtracker}}">bug tracker</a>
+						<a href="{{bugtracker}}">Bug Tracker</a>
 					</li>
 					<li>
-						<a href="{{rules}}">list of rules</a>
+						<a href="http://www.w3.org/TR/WCAG20/">WCAG 2.0 spec</a>
 					</li>
 				</ul>
 			</div>