From: Michael Tremer Date: Thu, 26 Oct 2023 16:45:10 +0000 (+0000) Subject: auth: Update messages to the new design X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=commitdiff_plain;h=bb3f580c1b76af21d15d6aabdb8482c3f16a0bd5 auth: Update messages to the new design Signed-off-by: Michael Tremer --- diff --git a/.gitignore b/.gitignore index 3c27d86e..26411034 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /src/scripts/ipfire.org-webapp /src/static/favicon.ico /src/static/img/apple-touch-icon-*-precomposed.png +/src/static/img/*@*.* /src/systemd/ipfire.org-webapp-*.service /src/templates/messages/*.css /ipfire.org.conf.sample diff --git a/Makefile.am b/Makefile.am index b88ec0a6..1ed1a498 100644 --- a/Makefile.am +++ b/Makefile.am @@ -967,6 +967,19 @@ static_img_DATA = \ static_imgdir = $(staticdir)/img +# From https://www.pexels.com/photo/123-let-s-go-imaginary-text-704767/ + +dist_static_img_auth_DATA = \ + src/static/img/auth/register.jpg + +static_img_auth_DATA = \ + src/static/img/auth/register@600.jpg + +CLEANFILES += \ + src/static/img/auth/register@600.jpg + +static_img_authdir = $(static_imgdir)/auth + static_images_tux_DATA = \ src/static/img/tux/ipfire_tux_16x16.png \ src/static/img/tux/ipfire_tux_20x20.png \ @@ -1090,6 +1103,11 @@ src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png -extent $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@)x$(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) \ $< $@ +# Resizes images for being used in messages which are 600px wide +%@600.jpg: %.jpg + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(CONVERT) -units PixelsPerInch $< -resize 600x -strip -quality 85 $@ + # Video Stuff FFMPEG += \ diff --git a/src/static/img/auth/register.jpg b/src/static/img/auth/register.jpg new file mode 100644 index 00000000..d4220690 Binary files /dev/null and b/src/static/img/auth/register.jpg differ diff --git a/src/templates/auth/messages/donation-reminder.html b/src/templates/auth/messages/donation-reminder.html index 22be8b0b..480037c7 100644 --- a/src/templates/auth/messages/donation-reminder.html +++ b/src/templates/auth/messages/donation-reminder.html @@ -1,62 +1,56 @@ {% extends "../../messages/base-promo.html" %} {% block content %} -

- {{ _("Hey again, %s,") % account.first_name }} -

- -

- {{ _("IPFire runs on supporters' donations, people like you!") }} -

- -

- {{ _("Why do we need you donations?") }} -

- - - -

- {{ _("All this, as you would understand, requires money. Every single donation counts.") }} -

- -

- {{ _("If you want to see IPFire thrive, we need your support.") }} -

- -

- {{ _("The best way to do this is by setting up a monthly donation which you can do here:") }} -

- - - - - - - - - -

- {{ _("We also have other ways to donate. Please go to https://www.ipfire.org/donate for details.") }} -

- -

- {{ _("Thank you so much for your support,") }} -
{{ _("-Michael") }} -

+ + +

{{ _("Hey again, %s,") % account.first_name }}

+ +

+ {{ _("IPFire runs on supporters' donations, people like you!") }} +

+ +

+ {{ _("Why do we need you donations?") }} +

+ + + +

+ {{ _("All this, as you would understand, requires money. Every single donation counts.") }} +

+ +

+ {{ _("If you want to see IPFire thrive, we need your support.") }} +

+ +

+ {{ _("The best way to do this is by setting up a monthly donation which you can do here:") }} +

+ + + + + +
+ + {{ _("Donate Now") }} + +
+ +

+ {{ _("We also have other ways to donate. Please go to https://www.ipfire.org/donate for details.") }} +

+ +

+ {{ _("Thank you so much for your support,") }} +
{{ _("-Michael") }} +

+ + {% end block %} diff --git a/src/templates/auth/messages/password-reset.html b/src/templates/auth/messages/password-reset.html index 8309d4ac..31e92af8 100644 --- a/src/templates/auth/messages/password-reset.html +++ b/src/templates/auth/messages/password-reset.html @@ -1,29 +1,24 @@ {% extends "../../messages/base.html" %} {% block content %} -

- {{ _("Hello %s!") % account.first_name }} -

+ + +

{{ _("Hello %s!") % account.first_name }}

-

- {{ _("You, or somebody else on your behalf, has requested to change your password.") }} {{ _("If this was not you, please notify a team member.") }} -

+

+ {{ _("You, or somebody else on your behalf, has requested to change your password.") }} + {{ _("If this was not you, please notify a team member.") }} +

- - - - - - - + + + + +
+ + {{ _("Reset Password") }} + +
+ + {% end block %} diff --git a/src/templates/auth/messages/profile-setup-2.html b/src/templates/auth/messages/profile-setup-2.html index 1c9fa0fa..4505f4f2 100644 --- a/src/templates/auth/messages/profile-setup-2.html +++ b/src/templates/auth/messages/profile-setup-2.html @@ -1,43 +1,37 @@ {% extends "../../messages/base.html" %} {% block content %} -

- {{ _("Hello once again, %s,") % account.first_name }} -

+ + +

{{ _("Hello once again, %s,") % account.first_name }}

-

- {{ _("we hope you are enjoying using IPFire.") }} -

+

+ {{ _("we hope you are enjoying using IPFire.") }} +

-

- {{ _("Did you know that you can get help from our community at https://community.ipfire.org?") }} - {{ _("People like me often post on here, providing help and support.") }} -

+

+ {{ _("Did you know that you can get help from our community at https://community.ipfire.org?") }} + {{ _("People like me often post on here, providing help and support.") }} +

-

- {{ _("But we also rely on you donations. Please consider helping us by setting up a small monthly donation:") }} -

+

+ {{ _("But we also rely on you donations. Please consider helping us by setting up a small monthly donation:") }} +

- - - - - - - + + + + +
+ + {{ _("Donate Now") }} + +
-

- {{ _("Thank you, we really appreciate your support,") }} -
{{ _("-Arne")}} -

+

+ {{ _("Thank you, we really appreciate your support,") }} +
{{ _("-Arne")}} +

+ + {% end block %} diff --git a/src/templates/auth/messages/profile-setup.html b/src/templates/auth/messages/profile-setup.html index 3ab3275a..4b17f9c2 100644 --- a/src/templates/auth/messages/profile-setup.html +++ b/src/templates/auth/messages/profile-setup.html @@ -1,47 +1,41 @@ {% extends "../../messages/base.html" %} {% block content %} -

- {{ _("Hello %s!") % account.first_name }} -

+ + +

{{ _("Hello %s!") % account.first_name }}

-

- {{ _("I would like to introduce myself: I'm Michael and I am one of the people behind the project. We are a team of passionate people who try to make the Internet a better place. On behalf of everyone, I would like to say: Welcome to the IPFire Project!") }} -

+

+ {{ _("I would like to introduce myself: I'm Michael and I am one of the people behind the project. We are a team of passionate people who try to make the Internet a better place. On behalf of everyone, I would like to say: Welcome to the IPFire Project!") }} +

-

- {{ _("We want you to feel a part of our team. Can I ask you to set up your profile? We would love to know a little bit more about you.") }} - {{ _("To do this, please log on to your profile and click the edit button.") }} -

+

+ {{ _("We want you to feel a part of our team. Can I ask you to set up your profile? We would love to know a little bit more about you.") }} + {{ _("To do this, please log on to your profile and click the edit button.") }} +

-

- {{ _("I would also like to invite you to join our community at https://community.ipfire.org, if you haven't already done so.") }} -

+

+ {{ _("I would also like to invite you to join our community at https://community.ipfire.org, if you haven't already done so.") }} +

-

- {{ _("Finally, this organisation relies on the generous donations of people like you. If you can, please consider supporting this project and the team behind it, so that we can continue our long-term vision, fund developers and promote our project.") }} -

+

+ {{ _("Finally, this organisation relies on the generous donations of people like you. If you can, please consider supporting this project and the team behind it, so that we can continue our long-term vision, fund developers and promote our project.") }} +

- - - - - - - + + + + +
+ + {{ _("Donate Now") }} + +
-

- {{ _("Thank you,") }} -
{{ _("-Michael") }} -

+

+ {{ _("Thank you,") }} +
{{ _("-Michael") }} +

+ + {% end block %} diff --git a/src/templates/auth/messages/register.html b/src/templates/auth/messages/register.html index 6c983dc7..bd3fc299 100644 --- a/src/templates/auth/messages/register.html +++ b/src/templates/auth/messages/register.html @@ -1,33 +1,36 @@ {% extends "../../messages/base.html" %} +{% block hero %} + + + IPFire + + +{% end block %} + {% block content %} -

- {{ _("Hello %s!") % first_name }} -

+ + +

{{ _("Hello %s!") % first_name }}

-

- {{ _("Thank you for registering a new account with us.") }} -

+

+ {{ _("Thank you for registering a new account with us.") }} +

-

- {{ _("This account will allow you to take part in our project. Either by joining conversations, writing documentation, or becoming a developer.") }} {{ _("There are many things you can do with your account.") }} -

+

+ {{ _("This account will allow you to take part in our project. Either by joining conversations, writing documentation, or becoming a developer.") }} + {{ _("There are many things you can do with your account.") }} +

- - - - - - - + + + + +
+ + {{ _("Activate Account") }} + +
+ + {% end block %}