From 702fdc14803df804eb017f2c93a16cff94edf4d7 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 29 May 2015 12:09:28 +0100 Subject: [PATCH] improved views for domain licence invites --- .../app/views/subscriptions/group/invite.jade | 30 +++++++++++-------- .../subscriptions/group/successful_join.jade | 12 +++++--- services/web/config/settings.defaults.coffee | 2 +- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/services/web/app/views/subscriptions/group/invite.jade b/services/web/app/views/subscriptions/group/invite.jade index 41f1c09b5a..db560abd3b 100644 --- a/services/web/app/views/subscriptions/group/invite.jade +++ b/services/web/app/views/subscriptions/group/invite.jade @@ -13,17 +13,23 @@ block content .page-header h1.text-centered #{translate("you_are_invited_to_group", {groupName:licenceName})} div(ng-show="!requestSent").row.text-centered - - .col-md-12 #{translate("you_can_claim_premium_account", {groupName:licenceName})} - .col-md-12   - .col-md-12 - span.pull-right - a.btn.btn-default(href="/project") #{translate("not_now")} -   - a.btn.btn.btn-primary(ng-click="joinGroup()") #{translate("verify_email_join_group")} + .row + .col-md-12 #{translate("group_provides_you_with_premium_account", {groupName:licenceName})} + .row + .col-md-12   + .row + .col-md-12 + .text-center + a.btn.btn-default(href="/project") #{translate("not_now")} +   + a.btn.btn.btn-primary(ng-click="joinGroup()") #{translate("verify_email_address")} - span(ng-show="requestSent").row.text-centered - .col-md-8 #{translate("check_email_to_complete_group")} - .col-md-4.pull-right - a.btn.btn.btn-primary(href="/project") #{translate("done")} + span(ng-show="requestSent").row.text-centered.text-center + .row + .col-md-12 #{translate("check_email_to_complete_the_upgrade")} + .row + .col-md-12   + .row + .col-md-12 + a.btn.btn.btn-primary(href="/project") #{translate("done")} diff --git a/services/web/app/views/subscriptions/group/successful_join.jade b/services/web/app/views/subscriptions/group/successful_join.jade index 0900c875e3..6de282aa36 100644 --- a/services/web/app/views/subscriptions/group/successful_join.jade +++ b/services/web/app/views/subscriptions/group/successful_join.jade @@ -13,9 +13,13 @@ block content .page-header.row.text-centered h1 #{translate("you_have_joined", {groupName:licenceName})} div(ng-show="!requestSent").row.text-centered - .span-md-12 #{translate("claim_premium_account", {groupName:licenceName})} - div - .span-md-12 - a.btn.btn-success(href="/project") #{translate("Done")} + .row + .span-md-12 #{translate("claim_premium_account", {groupName:licenceName})} + div + .row + .col-md-12   + .row + .span-md-12 + a.btn.btn-success(href="/project") #{translate("Done")} diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index c9b1f17841..ba32e7c4d0 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -350,7 +350,7 @@ module.exports = reloadModuleViewsOnEachRequest: true domainLicences: [ - {"domains":["gmail.com"], "adminUser_id":"555208e6ce4812e7d2319daa", "subscription_id":"555c6d1eb844bfb3964e0629", "name":"HENRYS AMAZING LICENCE", verifyEmail:true} + ] # ShareLaTeX Server Pro options (https://www.sharelatex.com/university/onsite.html)