From b657c5207e0c3c70a2859de6675936401c6bd881 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 27 May 2015 21:45:29 +0100 Subject: [PATCH] cleaned up the views a bit --- .../app/views/subscriptions/group/invite.jade | 23 +++++++++++-------- .../subscriptions/group/successful_join.jade | 11 +++++---- ...roup-subscription-invite-controller.coffee | 5 ++-- .../SubscriptionDomainHandlerTests.coffee | 2 -- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/services/web/app/views/subscriptions/group/invite.jade b/services/web/app/views/subscriptions/group/invite.jade index 06089e3d4b..dbbd4c7f0d 100644 --- a/services/web/app/views/subscriptions/group/invite.jade +++ b/services/web/app/views/subscriptions/group/invite.jade @@ -11,15 +11,18 @@ block content .col-md-8.col-md-offset-2(ng-cloak) .card(ng-controller="GroupSubscriptionInviteController") .page-header - h1 You are invited to Join #{licenceName} - span(ng-show="!requestSent") - div You can claim a free premium account provided by #{licenceName} by verifying your email + h1.text-centered You are invited to Join #{licenceName} + div(ng-show="!requestSent").row.text-centered - a.btn.btn-default(href="/project") Skip -   - a.btn.btn.btn-primary(ng-click="joinGroup()") Verify email and join Group + .col-md-12 You can claim a free premium account provided by #{licenceName} by verifying your email + .col-md-12   + .col-md-12 + span.pull-right + a.btn.btn-default(href="/project") Skip +   + a.btn.btn.btn-primary(ng-click="joinGroup()") Verify email and join Group - span(ng-show="requestSent") - div Check your email to complete joinging the group - - a.btn(href="/project") Continue to projects + span(ng-show="requestSent").row.text-centered + .col-md-8 Check your email to complete joinging the group + .col-md-4.pull-right + a.btn.btn.btn-primary(href="/project") Continue to projects diff --git a/services/web/app/views/subscriptions/group/successful_join.jade b/services/web/app/views/subscriptions/group/successful_join.jade index b2b0f26e79..6810e3a8f8 100644 --- a/services/web/app/views/subscriptions/group/successful_join.jade +++ b/services/web/app/views/subscriptions/group/successful_join.jade @@ -10,10 +10,11 @@ block content .row .col-md-8.col-md-offset-2(ng-cloak) .card - .page-header + .page-header.row.text-centered h1 You have joined #{licenceName} - span(ng-show="!requestSent") - div You have claimed your premium account provided by #{licenceName}. - - a.btn.btn-success(href="/project") Done + div(ng-show="!requestSent").row.text-centered + .span-md-12 + div You have claimed your premium account provided by #{licenceName}. + .span-md-12 + a.btn.btn-success(href="/project") Done diff --git a/services/web/public/coffee/main/subscription/group-subscription-invite-controller.coffee b/services/web/public/coffee/main/subscription/group-subscription-invite-controller.coffee index 4a31a5e0b1..ccfae4a3cf 100644 --- a/services/web/public/coffee/main/subscription/group-subscription-invite-controller.coffee +++ b/services/web/public/coffee/main/subscription/group-subscription-invite-controller.coffee @@ -6,9 +6,10 @@ define [ $scope.requestSent = false $scope.joinGroup = -> - console.log "joingin group" + $scope.requestSent = true request = $http.post "/user/subscription/#{subscription_id}/group/begin-join", {_csrf:window.csrfToken} request.success (data, status)-> - $scope.requestSent = true + if status != 200 # assume request worked + $scope.requestSent = false request.error (data, status)-> console.log "the request failed" \ No newline at end of file diff --git a/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee b/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee index 21a44da1ca..82c94d352c 100644 --- a/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee +++ b/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee @@ -23,8 +23,6 @@ describe "SubscriptionDomainHandler", -> "logger-sharelatex": log:-> "./SubscriptionGroupHandler": @SubscriptionGroupHandler - - describe "_findDomainLicence", -> it "should find the domain", (done)->