github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

cleaned up the views a bit

Browse source
This commit is contained in:
Henry Oswald 2015-05-27 21:45:29 +01:00
parent 22b94e9246
commit b657c5207e
4 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
services/web/app/views/subscriptions/group/invite.jade
View file

@ -11,15 +11,18 @@ block content
.col-md-8.col-md-offset-2(ng-cloak) .col-md-8.col-md-offset-2(ng-cloak)
.card(ng-controller="GroupSubscriptionInviteController") .card(ng-controller="GroupSubscriptionInviteController")
.page-header .page-header
h1 You are invited to Join #{licenceName} h1.text-centered You are invited to Join #{licenceName}
span(ng-show="!requestSent") div(ng-show="!requestSent").row.text-centered
div You can claim a free premium account provided by #{licenceName} by verifying your email
a.btn.btn-default(href="/project") Skip .col-md-12 You can claim a free premium account provided by #{licenceName} by verifying your email
  .col-md-12  
a.btn.btn.btn-primary(ng-click="joinGroup()") Verify email and join Group .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") span(ng-show="requestSent").row.text-centered
div Check your email to complete joinging the group .col-md-8 Check your email to complete joinging the group
.col-md-4.pull-right
a.btn(href="/project") Continue to projects a.btn.btn.btn-primary(href="/project") Continue to projects

11
services/web/app/views/subscriptions/group/successful_join.jade
View file

@ -10,10 +10,11 @@ block content
.row .row
.col-md-8.col-md-offset-2(ng-cloak) .col-md-8.col-md-offset-2(ng-cloak)
.card .card
.page-header .page-header.row.text-centered
h1 You have joined #{licenceName} h1 You have joined #{licenceName}
span(ng-show="!requestSent") div(ng-show="!requestSent").row.text-centered
div You have claimed your premium account provided by #{licenceName}. .span-md-12
div You have claimed your premium account provided by #{licenceName}.
a.btn.btn-success(href="/project") Done .span-md-12
a.btn.btn-success(href="/project") Done

5
services/web/public/coffee/main/subscription/group-subscription-invite-controller.coffee
View file

@ -6,9 +6,10 @@ define [
$scope.requestSent = false $scope.requestSent = false
$scope.joinGroup = -> $scope.joinGroup = ->
console.log "joingin group" $scope.requestSent = true
request = $http.post "/user/subscription/#{subscription_id}/group/begin-join", {_csrf:window.csrfToken} request = $http.post "/user/subscription/#{subscription_id}/group/begin-join", {_csrf:window.csrfToken}
request.success (data, status)-> request.success (data, status)->
$scope.requestSent = true if status != 200 # assume request worked
$scope.requestSent = false
request.error (data, status)-> request.error (data, status)->
console.log "the request failed" console.log "the request failed"

2
services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee
View file

@ -23,8 +23,6 @@ describe "SubscriptionDomainHandler", ->
"logger-sharelatex": log:-> "logger-sharelatex": log:->
"./SubscriptionGroupHandler": @SubscriptionGroupHandler "./SubscriptionGroupHandler": @SubscriptionGroupHandler
describe "_findDomainLicence", -> describe "_findDomainLicence", ->
it "should find the domain", (done)-> it "should find the domain", (done)->