diff --git a/.isort.cfg b/.isort.cfg deleted file mode 100644 index ba73fb7af..000000000 --- a/.isort.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[settings] -# Needed for black compatibility -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -line_length=88 -combine_as_imports=True - -# If set, imports will be sorted within their section independent to the import_type. -force_sort_within_sections=True - -# skip -skip_glob=.local,**/migrations/**,**/node_modules/**,**/node-forge/** diff --git a/ihatemoney/default_settings.py b/ihatemoney/default_settings.py index cf0d58485..0c0e8e794 100644 --- a/ihatemoney/default_settings.py +++ b/ihatemoney/default_settings.py @@ -48,3 +48,4 @@ "uk", "zh_Hans", ] +SHOWCASE_LANGUAGES = ["en", "fr"] diff --git a/ihatemoney/static/showcase/en/1.webp b/ihatemoney/static/showcase/en/1.webp new file mode 100644 index 000000000..12290bf82 Binary files /dev/null and b/ihatemoney/static/showcase/en/1.webp differ diff --git a/ihatemoney/static/showcase/en/2.webp b/ihatemoney/static/showcase/en/2.webp new file mode 100644 index 000000000..e549463ba Binary files /dev/null and b/ihatemoney/static/showcase/en/2.webp differ diff --git a/ihatemoney/static/showcase/en/3.webp b/ihatemoney/static/showcase/en/3.webp new file mode 100644 index 000000000..8d1a1dd18 Binary files /dev/null and b/ihatemoney/static/showcase/en/3.webp differ diff --git a/ihatemoney/static/showcase/en/4.webp b/ihatemoney/static/showcase/en/4.webp new file mode 100644 index 000000000..556e00742 Binary files /dev/null and b/ihatemoney/static/showcase/en/4.webp differ diff --git a/ihatemoney/static/showcase/en/5.webp b/ihatemoney/static/showcase/en/5.webp new file mode 100644 index 000000000..e43b58c8a Binary files /dev/null and b/ihatemoney/static/showcase/en/5.webp differ diff --git a/ihatemoney/static/showcase/en/6.webp b/ihatemoney/static/showcase/en/6.webp new file mode 100644 index 000000000..0ba6d7f4c Binary files /dev/null and b/ihatemoney/static/showcase/en/6.webp differ diff --git a/ihatemoney/static/showcase/en/7.webp b/ihatemoney/static/showcase/en/7.webp new file mode 100644 index 000000000..7d65450e5 Binary files /dev/null and b/ihatemoney/static/showcase/en/7.webp differ diff --git a/ihatemoney/static/showcase/en/8.webp b/ihatemoney/static/showcase/en/8.webp new file mode 100644 index 000000000..0dabb1a70 Binary files /dev/null and b/ihatemoney/static/showcase/en/8.webp differ diff --git a/ihatemoney/static/showcase/en/9.webp b/ihatemoney/static/showcase/en/9.webp new file mode 100644 index 000000000..45c7040dc Binary files /dev/null and b/ihatemoney/static/showcase/en/9.webp differ diff --git a/ihatemoney/static/showcase/1.webp b/ihatemoney/static/showcase/fr/1.webp similarity index 100% rename from ihatemoney/static/showcase/1.webp rename to ihatemoney/static/showcase/fr/1.webp diff --git a/ihatemoney/static/showcase/2.webp b/ihatemoney/static/showcase/fr/2.webp similarity index 100% rename from ihatemoney/static/showcase/2.webp rename to ihatemoney/static/showcase/fr/2.webp diff --git a/ihatemoney/static/showcase/3.webp b/ihatemoney/static/showcase/fr/3.webp similarity index 100% rename from ihatemoney/static/showcase/3.webp rename to ihatemoney/static/showcase/fr/3.webp diff --git a/ihatemoney/static/showcase/4.webp b/ihatemoney/static/showcase/fr/4.webp similarity index 100% rename from ihatemoney/static/showcase/4.webp rename to ihatemoney/static/showcase/fr/4.webp diff --git a/ihatemoney/static/showcase/5.webp b/ihatemoney/static/showcase/fr/5.webp similarity index 100% rename from ihatemoney/static/showcase/5.webp rename to ihatemoney/static/showcase/fr/5.webp diff --git a/ihatemoney/static/showcase/6.webp b/ihatemoney/static/showcase/fr/6.webp similarity index 100% rename from ihatemoney/static/showcase/6.webp rename to ihatemoney/static/showcase/fr/6.webp diff --git a/ihatemoney/static/showcase/7.webp b/ihatemoney/static/showcase/fr/7.webp similarity index 100% rename from ihatemoney/static/showcase/7.webp rename to ihatemoney/static/showcase/fr/7.webp diff --git a/ihatemoney/static/showcase/8.webp b/ihatemoney/static/showcase/fr/8.webp similarity index 100% rename from ihatemoney/static/showcase/8.webp rename to ihatemoney/static/showcase/fr/8.webp diff --git a/ihatemoney/static/showcase/9.webp b/ihatemoney/static/showcase/fr/9.webp similarity index 100% rename from ihatemoney/static/showcase/9.webp rename to ihatemoney/static/showcase/fr/9.webp diff --git a/ihatemoney/static/showcase_en/1.webp b/ihatemoney/static/showcase_en/1.webp deleted file mode 100644 index ca8d1371b..000000000 Binary files a/ihatemoney/static/showcase_en/1.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/2.webp b/ihatemoney/static/showcase_en/2.webp deleted file mode 100644 index 1f64a96ee..000000000 Binary files a/ihatemoney/static/showcase_en/2.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/3.webp b/ihatemoney/static/showcase_en/3.webp deleted file mode 100644 index a72f13a0d..000000000 Binary files a/ihatemoney/static/showcase_en/3.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/4.webp b/ihatemoney/static/showcase_en/4.webp deleted file mode 100644 index f6f5632c9..000000000 Binary files a/ihatemoney/static/showcase_en/4.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/5.webp b/ihatemoney/static/showcase_en/5.webp deleted file mode 100644 index bd5b3160c..000000000 Binary files a/ihatemoney/static/showcase_en/5.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/6.webp b/ihatemoney/static/showcase_en/6.webp deleted file mode 100644 index 9d5b72ea0..000000000 Binary files a/ihatemoney/static/showcase_en/6.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/7.webp b/ihatemoney/static/showcase_en/7.webp deleted file mode 100644 index 5a70a48ec..000000000 Binary files a/ihatemoney/static/showcase_en/7.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/8.webp b/ihatemoney/static/showcase_en/8.webp deleted file mode 100644 index 914ae6363..000000000 Binary files a/ihatemoney/static/showcase_en/8.webp and /dev/null differ diff --git a/ihatemoney/static/showcase_en/9.webp b/ihatemoney/static/showcase_en/9.webp deleted file mode 100644 index e1609368e..000000000 Binary files a/ihatemoney/static/showcase_en/9.webp and /dev/null differ diff --git a/ihatemoney/templates/home.html b/ihatemoney/templates/home.html index 50a26773a..d97fe6093 100644 --- a/ihatemoney/templates/home.html +++ b/ihatemoney/templates/home.html @@ -1,106 +1,91 @@ {% extends "layout.html" %} - {% block body %} - +
+
+
+
{{ _("Log in to an existing project") }}
+
+
- {{ forms.create_project(project_form, home=True) }} + + {{ forms.authenticate(auth_form, home=True) }}
- + + {{ _("can't remember your password?") }}
+ +
+
+
+
{{ _("Create a new project") }}
+
+ {% if is_public_project_creation_allowed %} +
+
+ {{ forms.create_project(project_form, home=True) }} +
+
+ +
- {% else %} - - {{ _("Create a new project") }} - - {% endif %} + {% else %} + {{ _("Create a new project") }} + {% endif %} +
- -
+ {% endblock %} {% block js %} -$('#creation-form #password').tooltip({ - title: "{{ _("Don\\'t reuse a personal password. Choose a private code and send it to your friends") }}", - trigger: 'focus', - placement: 'right' -}); -{% endblock %} \ No newline at end of file + $('#creation-form #password').tooltip({ + title: "{{ _("Don\\'t reuse a personal password. Choose a private code and send it to your friends") }}", + trigger: 'focus', + placement: 'right' + }); +{% endblock %} diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index 5c04fb2ea..5fb76c4a5 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -46,7 +46,7 @@ - {% if g.lang == 'fr' %}{% include "showcase.html" %}{% endif %} + {% if display_showcase %}{% include "showcase.html" %}{% endif %}