From 827629a74a52bfaf006637bb5f8c6ff2a411dcff Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Wed, 27 Jul 2016 10:10:44 +0100
Subject: [PATCH] Invalid-invite page, and re-jigg the share modal

---
 .../CollaboratorsInviteController.coffee      |  2 +-
 .../web/app/views/project/editor/share.jade   | 14 ++++++++------
 .../app/views/project/invite/not-valid.jade   | 19 ++++++++++++++++++-
 .../web/public/stylesheets/app/invite.less    |  8 ++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
index 4dcf5134f5..aa886fdfff 100644
--- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
+++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
@@ -59,7 +59,7 @@ module.exports = CollaboratorsInviteController =
 				logger.err {projectId, token}, "error getting invite by token"
 				return next(err)
 			_renderInvalidPage = () ->
-				res.render "project/invite/not-valid", {invite}
+				res.render "project/invite/not-valid"
 			if !invite
 				logger.log {projectId, token}, "no invite found for token"
 				return _renderInvalidPage()
diff --git a/services/web/app/views/project/editor/share.jade b/services/web/app/views/project/editor/share.jade
index 4d6bee100b..cf35918a98 100644
--- a/services/web/app/views/project/editor/share.jade
+++ b/services/web/app/views/project/editor/share.jade
@@ -27,12 +27,12 @@ script(type='text/ng-template', id='shareProjectModalTemplate')
 					) #{translate("make_private")}
 			.row.project-member
 				.col-xs-8 {{ project.owner.email }}
-				.text-right(
+				.text-left(
 					ng-class="{'col-xs-3': project.members.length > 0, 'col-xs-4': project.members.length == 0}"
 				) #{translate("owner")}
 			.row.project-member(ng-repeat="member in project.members")
 				.col-xs-8 {{ member.email }}
-				.col-xs-3.text-right
+				.col-xs-3.text-left
 					span(ng-show="member.privileges == 'readAndWrite'") #{translate("can_edit")}
 					span(ng-show="member.privileges == 'readOnly'") #{translate("read_only")}
 				.col-xs-1
@@ -44,10 +44,12 @@ script(type='text/ng-template', id='shareProjectModalTemplate')
 					)
 						i.fa.fa-times
 			.row.project-invite(ng-repeat="invite in state.invites")
-				.col-xs-8 {{ invite.email }} (invite)
-				.col-xs-3.text-right
-					span(ng-show="member.privileges == 'readAndWrite'") #{translate("can_edit")}
-					span(ng-show="member.privileges == 'readOnly'") #{translate("read_only")}
+				.col-xs-8 {{ invite.email }}&nbsp;
+					span.label.label-primary pending
+				.col-xs-3.text-left
+					// todo: get invite privileges
+					span(ng-show="invite.privileges == 'readAndWrite'") #{translate("can_edit")}
+					span(ng-show="invite.privileges == 'readOnly'") #{translate("read_only")}
 				.col-xs-1
 					a(
 						href
diff --git a/services/web/app/views/project/invite/not-valid.jade b/services/web/app/views/project/invite/not-valid.jade
index 6eb6306b16..d01cb82c81 100644
--- a/services/web/app/views/project/invite/not-valid.jade
+++ b/services/web/app/views/project/invite/not-valid.jade
@@ -1 +1,18 @@
-h1 Invite Not Valid TEST
\ No newline at end of file
+extends ../../layout
+
+block content
+	.content.content-alt
+		.container
+			.row
+				.col-md-8.col-md-offset-2
+					.card.project-invite-invalid
+						.page-header.text-centered
+							h1  This is not a valid project invite
+						.row.text-center
+							.col-md-12
+								p
+									| The invite may have expired. Please contact the project owner.
+						.row.text-center.actions
+							.col-md-12
+								a.btn.btn-info(href="/project") #{translate("back_to_your_projects")}
+							
\ No newline at end of file
diff --git a/services/web/public/stylesheets/app/invite.less b/services/web/public/stylesheets/app/invite.less
index 4354aa79c4..aaa6f08ab4 100644
--- a/services/web/public/stylesheets/app/invite.less
+++ b/services/web/public/stylesheets/app/invite.less
@@ -2,4 +2,12 @@
 	form {
 		padding-top: 15px;
 	}
+	margin-bottom: 30px;
+}
+
+.project-invite-invalid {
+	.actions {
+		padding-top: 15px;
+	}
+	margin-bottom: 30px;
 }
\ No newline at end of file