From e04bf3273c19f22e2ea698fc0c51be09d15d1215 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Wed, 5 Jul 2017 20:14:00 -0700 Subject: [PATCH] emails: Rename email_base.html to email_base_default.html. About to add another template for digest and missed message emails. Another natural name would be email_base_transactional, but the followup_day{1,2} emails aren't really transactional. --- templates/zerver/emails/confirm_new_email.html | 2 +- templates/zerver/emails/confirm_registration.html | 2 +- .../zerver/emails/{email_base.html => email_base_default.html} | 0 templates/zerver/emails/find_team.html | 2 +- templates/zerver/emails/followup_day1.html | 2 +- templates/zerver/emails/followup_day2.html | 2 +- templates/zerver/emails/invitation.html | 2 +- templates/zerver/emails/invitation_reminder.html | 2 +- templates/zerver/emails/notify_change_in_email.html | 2 +- templates/zerver/emails/notify_new_login.html | 2 +- templates/zerver/emails/password_reset.html | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename templates/zerver/emails/{email_base.html => email_base_default.html} (100%) diff --git a/templates/zerver/emails/confirm_new_email.html b/templates/zerver/emails/confirm_new_email.html index ccc90f581d..2840cc3e43 100644 --- a/templates/zerver/emails/confirm_new_email.html +++ b/templates/zerver/emails/confirm_new_email.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hi! diff --git a/templates/zerver/emails/confirm_registration.html b/templates/zerver/emails/confirm_registration.html index 7ad41e8f6f..2b28c16ad4 100644 --- a/templates/zerver/emails/confirm_registration.html +++ b/templates/zerver/emails/confirm_registration.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hello there. diff --git a/templates/zerver/emails/email_base.html b/templates/zerver/emails/email_base_default.html similarity index 100% rename from templates/zerver/emails/email_base.html rename to templates/zerver/emails/email_base_default.html diff --git a/templates/zerver/emails/find_team.html b/templates/zerver/emails/find_team.html index ba5adfa453..d50c94a393 100644 --- a/templates/zerver/emails/find_team.html +++ b/templates/zerver/emails/find_team.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hi {{ user_profile.full_name }},

diff --git a/templates/zerver/emails/followup_day1.html b/templates/zerver/emails/followup_day1.html index b1f6788dcb..dc32ef4c08 100644 --- a/templates/zerver/emails/followup_day1.html +++ b/templates/zerver/emails/followup_day1.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hi there!

diff --git a/templates/zerver/emails/followup_day2.html b/templates/zerver/emails/followup_day2.html index 7ed66a5d50..f0bdbb00ff 100644 --- a/templates/zerver/emails/followup_day2.html +++ b/templates/zerver/emails/followup_day2.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hey,

diff --git a/templates/zerver/emails/invitation.html b/templates/zerver/emails/invitation.html index 554122e842..4ea2b0e036 100644 --- a/templates/zerver/emails/invitation.html +++ b/templates/zerver/emails/invitation.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hi there, diff --git a/templates/zerver/emails/invitation_reminder.html b/templates/zerver/emails/invitation_reminder.html index d73434089e..77b594aa52 100644 --- a/templates/zerver/emails/invitation_reminder.html +++ b/templates/zerver/emails/invitation_reminder.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hi again, diff --git a/templates/zerver/emails/notify_change_in_email.html b/templates/zerver/emails/notify_change_in_email.html index b1114c25c0..8b456bef85 100644 --- a/templates/zerver/emails/notify_change_in_email.html +++ b/templates/zerver/emails/notify_change_in_email.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hi,

diff --git a/templates/zerver/emails/notify_new_login.html b/templates/zerver/emails/notify_new_login.html index fba316073b..f768fbbe9f 100644 --- a/templates/zerver/emails/notify_new_login.html +++ b/templates/zerver/emails/notify_new_login.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}

Hello, {{ user.full_name | title }}.

diff --git a/templates/zerver/emails/password_reset.html b/templates/zerver/emails/password_reset.html index a9e9816c5a..e75bd2fcd1 100644 --- a/templates/zerver/emails/password_reset.html +++ b/templates/zerver/emails/password_reset.html @@ -1,4 +1,4 @@ -{% extends "zerver/emails/email_base.html" %} +{% extends "zerver/emails/email_base_default.html" %} {% block content %}