]> git.ipfire.org Git - ipfire.org.git/commitdiff
auth: Update messages to the new design
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Oct 2023 16:45:10 +0000 (16:45 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Oct 2023 16:46:24 +0000 (16:46 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
.gitignore
Makefile.am
src/static/img/auth/register.jpg [new file with mode: 0644]
src/templates/auth/messages/donation-reminder.html
src/templates/auth/messages/password-reset.html
src/templates/auth/messages/profile-setup-2.html
src/templates/auth/messages/profile-setup.html
src/templates/auth/messages/register.html

index 3c27d86e870d7e23e324cbefe47fbbc939878b41..264110341ae0a679943f8af99db848c030c7660d 100644 (file)
@@ -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
index b88ec0a603a6b9a5ca43d8e67450f6547ead2836..1ed1a4983f29af37f403159e80cd2f567c43f353 100644 (file)
@@ -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 (file)
index 0000000..d422069
Binary files /dev/null and b/src/static/img/auth/register.jpg differ
index 22be8b0b9e90232c86db6cc22d26138e7288956b..480037c73f8f9719d9a1456e9d76a26f3448e539 100644 (file)
@@ -1,62 +1,56 @@
 {% extends "../../messages/base-promo.html" %}
 
 {% block content %}
-    <p>
-        <strong>{{ _("Hey again, %s,") % account.first_name }}</strong>
-    </p>
-
-    <p>
-        {{ _("IPFire runs on supporters' donations, people like you!") }}
-    </p>
-
-    <p>
-        {{ _("Why do we need you donations?") }}
-    </p>
-
-    <ul>
-        <li>{{ _("Your money ensures the longevity and long-term success of this project.") }}</li>
-        <li>{{ _("It helps us fund developers and extend our skills") }}</li>
-        <li>{{ _("It will aid us to promote IPFire to more people around the world") }}</li>
-        <li>{{ _("This funds conferences, where we focus on future projects") }}</li>
-        <li>{{ _("It pays for our hosting") }}</li>
-    </ul>
-
-    <p>
-        {{ _("All this, as you would understand, requires money. Every single donation counts.") }}
-    </p>
-
-    <p>
-        {{ _("If you want to see IPFire thrive, we need your support.") }}
-    </p>
-
-    <p>
-        {{ _("The best way to do this is by setting up a monthly donation which you can do here:") }}
-    </p>
-
-       <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-               <tbody>
-                       <tr>
-                               <td align="left">
-                                       <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                               <tbody>
-                                                       <tr>
-                                                               <td>
-                                    <a href="https://www.ipfire.org/donate?frequency=monthly&amp;amount=10" target="_blank">{{ _("Donate Now") }}</a>
-                                </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
-
-    <p>
-        {{ _("We also have other ways to donate. Please go to https://www.ipfire.org/donate for details.") }}
-    </p>
-
-    <p>
-        {{ _("Thank you so much for your support,") }}
-        <br>{{ _("-Michael") }}
-    </p>
+       <tr class="section">
+               <td>
+                       <h1>{{ _("Hey again, %s,") % account.first_name }}</h1>
+
+                       <p>
+                               {{ _("IPFire runs on supporters' donations, people like you!") }}
+                       </p>
+
+                       <p>
+                               {{ _("Why do we need you donations?") }}
+                       </p>
+
+                       <ul>
+                               <li>{{ _("Your money ensures the longevity and long-term success of this project.") }}</li>
+                               <li>{{ _("It helps us fund developers and extend our skills") }}</li>
+                               <li>{{ _("It will aid us to promote IPFire to more people around the world") }}</li>
+                               <li>{{ _("This funds conferences, where we focus on future projects") }}</li>
+                               <li>{{ _("It pays for our hosting") }}</li>
+                       </ul>
+
+                       <p>
+                               {{ _("All this, as you would understand, requires money. Every single donation counts.") }}
+                       </p>
+
+                       <p>
+                               {{ _("If you want to see IPFire thrive, we need your support.") }}
+                       </p>
+
+                       <p>
+                               {{ _("The best way to do this is by setting up a monthly donation which you can do here:") }}
+                       </p>
+
+                       <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
+                               <tr class="button">
+                                       <td>
+                                                <a class="primary" href="https://www.ipfire.org/donate?frequency=monthly&amp;amount=10">
+                                                       {{ _("Donate Now") }}
+                                                </a>
+                                       </td>
+                               </tr>
+                       </table>
+
+                       <p>
+                               {{ _("We also have other ways to donate. Please go to https://www.ipfire.org/donate for details.") }}
+                       </p>
+
+                       <p>
+                               {{ _("Thank you so much for your support,") }}
+                               <br>{{ _("-Michael") }}
+                       </p>
+               </td>
+       </tr>
 {% end block %}
index 8309d4ac8f9f7588958f778a5997ac134f2831d2..31e92af89e86183f7ce79b8ee6426905e25c7aa9 100644 (file)
@@ -1,29 +1,24 @@
 {% extends "../../messages/base.html" %}
 
 {% block content %}
-    <p>
-        <strong>{{ _("Hello %s!") % account.first_name }}</strong>
-    </p>
+       <tr class="section">
+               <td>
+               <h1>{{ _("Hello %s!") % account.first_name }}</h1>
 
-    <p>
-        {{ _("You, or somebody else on your behalf, has requested to change your password.") }} {{ _("If this was not you, please notify a team member.") }}
-    </p>
+                       <p>
+                               {{ _("You, or somebody else on your behalf, has requested to change your password.") }}
+                               {{ _("If this was not you, please notify a team member.") }}
+                       </p>
 
-       <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-               <tbody>
-                       <tr>
-                               <td align="left">
-                                       <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                               <tbody>
-                                                       <tr>
-                                                               <td>
-                                    <a href="https://people.ipfire.org/password-reset/{{ account.uid }}/{{ reset_code }}" target="_blank">{{ _("Reset Password") }}</a>
-                                </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
+                       <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
+                               <tr class="button">
+                                       <td>
+                                                <a class="primary" href="https://people.ipfire.org/password-reset/{{ account.uid }}/{{ reset_code }}">
+                                                       {{ _("Reset Password") }}
+                                                </a>
+                                       </td>
+                               </tr>
+                       </table>
+               </td>
+       </tr>
 {% end block %}
index 1c9fa0fa1f8db504718528e1ffd096cd45d4194f..4505f4f225791e91fa3dabd613661e76e529c096 100644 (file)
@@ -1,43 +1,37 @@
 {% extends "../../messages/base.html" %}
 
 {% block content %}
-    <p>
-        <strong>{{ _("Hello once again, %s,") % account.first_name }}</strong>
-    </p>
+       <tr class="section">
+               <td>
+                       <h1>{{ _("Hello once again, %s,") % account.first_name }}</h1>
 
-    <p>
-        {{ _("we hope you are enjoying using IPFire.") }}
-    </p>
+                       <p>
+                               {{ _("we hope you are enjoying using IPFire.") }}
+                       </p>
 
-    <p>
-        {{ _("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.") }}
-    </p>
+                       <p>
+                               {{ _("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.") }}
+                       </p>
 
-    <p>
-        {{ _("But we also rely on you donations. Please consider helping us by setting up a small monthly donation:") }}
-    </p>
+                       <p>
+                               {{ _("But we also rely on you donations. Please consider helping us by setting up a small monthly donation:") }}
+                       </p>
 
-       <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-               <tbody>
-                       <tr>
-                               <td align="left">
-                                       <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                               <tbody>
-                                                       <tr>
-                                                               <td>
-                                    <a href="https://www.ipfire.org/donate?frequency=monthly" target="_blank">{{ _("Donate Now") }}</a>
-                                </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
+                       <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
+                               <tr class="button">
+                                       <td>
+                                                <a class="primary" href="https://www.ipfire.org/donate?frequency=monthly">
+                                                       {{ _("Donate Now") }}
+                                                </a>
+                                       </td>
+                               </tr>
+                       </table>
 
-    <p>
-        {{ _("Thank you, we really appreciate your support,") }}
-        <br>{{ _("-Arne")}}
-    </p>
+                       <p>
+                               {{ _("Thank you, we really appreciate your support,") }}
+                               <br>{{ _("-Arne")}}
+                       </p>
+               </td>
+       </tr>
 {% end block %}
index 3ab3275a3c44508ea6193ab983aacfe16f2e9045..4b17f9c24b16cb0a7dcd39c0c0ea59e4198b0ea1 100644 (file)
@@ -1,47 +1,41 @@
 {% extends "../../messages/base.html" %}
 
 {% block content %}
-    <p>
-        <strong>{{ _("Hello %s!") % account.first_name }}</strong>
-    </p>
+       <tr class="section">
+               <td>
+               <h1>{{ _("Hello %s!") % account.first_name }}</h1>
 
-    <p>
-        {{ _("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!") }}
-    </p>
+                       <p>
+                               {{ _("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!") }}
+                       </p>
 
-    <p>
-        {{ _("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.") }}
-    </p>
+                       <p>
+                               {{ _("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.") }}
+                       </p>
 
-    <p>
-        {{ _("I would also like to invite you to join our community at https://community.ipfire.org, if you haven't already done so.") }}
-    </p>
+                       <p>
+                               {{ _("I would also like to invite you to join our community at https://community.ipfire.org, if you haven't already done so.") }}
+                       </p>
 
-    <p>
-        {{ _("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.") }}
-    </p>
+                       <p>
+                               {{ _("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.") }}
+                       </p>
 
-       <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-               <tbody>
-                       <tr>
-                               <td align="left">
-                                       <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                               <tbody>
-                                                       <tr>
-                                                               <td>
-                                    <a href="https://www.ipfire.org/donate" target="_blank">{{ _("Donate Now") }}</a>
-                                </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
+                       <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
+                               <tr class="button">
+                                       <td>
+                                                <a class="primary" href="https://www.ipfire.org/donate">
+                                                       {{ _("Donate Now") }}
+                                                </a>
+                                       </td>
+                               </tr>
+                       </table>
 
-    <p>
-        {{ _("Thank you,") }}
-        <br>{{ _("-Michael") }}
-    </p>
+                       <p>
+                               {{ _("Thank you,") }}
+                               <br>{{ _("-Michael") }}
+                       </p>
+               </td>
+       </tr>
 {% end block %}
index 6c983dc7b81193853063553e5917000743cfa177..bd3fc29945dcb7e7a840dbe6233f1dfa3d4d25b2 100644 (file)
@@ -1,33 +1,36 @@
 {% extends "../../messages/base.html" %}
 
+{% block hero %}
+       <tr class="hero">
+               <td>
+                       <img class="g-img" src="{{ embed_image("img/auth/register@600.jpg") }}" alt="IPFire">
+               </td>
+       </tr>
+{% end block %}
+
 {% block content %}
-    <p>
-        <strong>{{ _("Hello %s!") % first_name }}</strong>
-    </p>
+       <tr class="section">
+               <td>
+                       <h1>{{ _("Hello %s!") % first_name }}</h1>
 
-    <p>
-        {{ _("Thank you for registering a new account with us.") }}
-    </p>
+                       <p>
+                               {{ _("Thank you for registering a new account with us.") }}
+                       </p>
 
-    <p>
-        {{ _("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.") }}
-    </p>
+                       <p>
+                               {{ _("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.") }}
+                       </p>
 
-       <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-               <tbody>
-                       <tr>
-                               <td align="left">
-                                       <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                               <tbody>
-                                                       <tr>
-                                                               <td>
-                                    <a href="https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}" target="_blank">{{ _("Activate Account") }}</a>
-                                </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
+                       <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
+                               <tr class="button">
+                                       <td>
+                                                <a class="primary" href="https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}">
+                                                       {{ _("Activate Account") }}
+                                                </a>
+                                       </td>
+                               </tr>
+                       </table>
+               </td>
+       </tr>
 {% end block %}