From ce79bfbc339f272c19a457a2006190a4e4be86ed Mon Sep 17 00:00:00 2001 From: longze chen Date: Wed, 5 Apr 2017 13:43:21 -0400 Subject: [PATCH 1/4] Add campaign support for OSF Registries: - campaign - signup page - confirmation mail template - landing page after confirmation --- framework/auth/campaigns.py | 11 +++++++++++ website/mails/mails.py | 4 ++++ .../img/registries/osf-registries-black.png | Bin 0 -> 10787 bytes .../emails/confirm_registries_osf.txt.mako | 9 +++++++++ website/templates/public/register.mako | 16 +++++++++++++++- 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 website/static/img/registries/osf-registries-black.png create mode 100644 website/templates/emails/confirm_registries_osf.txt.mako diff --git a/framework/auth/campaigns.py b/framework/auth/campaigns.py index 5bb973d83019..76b63ba9c86e 100644 --- a/framework/auth/campaigns.py +++ b/framework/auth/campaigns.py @@ -69,6 +69,17 @@ def get_campaigns(): } }) + # Proxy campaigns: Registries, OSF only + newest_campaigns.update({ + 'osf-registries': { + 'system_tag': 'osf_registries', + 'redirect_url': furl.furl(DOMAIN).add(path='registries/').url, + 'confirmation_email_template': mails.CONFIRM_EMAIL_REGISTRIES_OSF, + 'login_type': 'proxy', + 'provider': 'osf', + } + }) + CAMPAIGNS = newest_campaigns CAMPAIGNS_LAST_REFRESHED = timezone.now() diff --git a/website/mails/mails.py b/website/mails/mails.py index 2afb0e160195..c332ca9c417e 100644 --- a/website/mails/mails.py +++ b/website/mails/mails.py @@ -174,6 +174,10 @@ def get_english_article(word): 'confirm_preprints_{}'.format(name), subject='Open Science Framework Account Verification, {} Preprints Service'.format(provider) ) +CONFIRM_EMAIL_REGISTRIES_OSF = Mail( + 'confirm_registries_osf', + subject='Open Science Framework Account Verification, OSF Registries' +) # Merge account, add or remove email confirmation emails. CONFIRM_MERGE = Mail('confirm_merge', subject='Confirm account merge') diff --git a/website/static/img/registries/osf-registries-black.png b/website/static/img/registries/osf-registries-black.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb5edd30d89655cd65d4974c8e220eb2d529d3c GIT binary patch literal 10787 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 K`5H5H-2VYYH+bOy literal 0 HcmV?d00001 diff --git a/website/templates/emails/confirm_registries_osf.txt.mako b/website/templates/emails/confirm_registries_osf.txt.mako new file mode 100644 index 000000000000..30f491851b0c --- /dev/null +++ b/website/templates/emails/confirm_registries_osf.txt.mako @@ -0,0 +1,9 @@ +Hello ${user.fullname}, + +Welcome to the Open Science Framework and OSF Registries. To continue, please verify your email address by visiting this link: + +${confirmation_url} + + +Sincerely, +From the team at the Center for Open Science diff --git a/website/templates/public/register.mako b/website/templates/public/register.mako index b72441dfff3d..c4084bcee7cc 100644 --- a/website/templates/public/register.mako +++ b/website/templates/public/register.mako @@ -61,12 +61,26 @@ %endif + %if campaign == "osf-registries": +
+

OSF Registries


+

Please login to the Open Science Framework or create a free account to continue.

+
+ %endif +
%if campaign != "institution" or not enable_institutions: