From 2933ebdfd8dd376528229a56283cd85536bc0fe1 Mon Sep 17 00:00:00 2001
From: 0livd <gh@destras.fr>
Date: Mon, 13 Nov 2017 18:08:39 +0100
Subject: [PATCH] Skip invite page after project creation

- Replace ``The project identifier is demo, remember it!``
by ``Invite other people to join this project!``
(linking to the invite page)
- Encourage users to share the project password via other
communication means in the reminder email
---
 CHANGELOG.rst                                 |   2 +-
 ihatemoney/templates/list_bills.html          |   2 +-
 ihatemoney/templates/reminder_mail.en         |   4 ++-
 ihatemoney/templates/reminder_mail.fr         |   2 ++
 ihatemoney/templates/send_invites.html        |  14 ++++----
 .../translations/fr/LC_MESSAGES/messages.mo   | Bin 9694 -> 9762 bytes
 .../translations/fr/LC_MESSAGES/messages.po   |  33 ++++++------------
 ihatemoney/web.py                             |   2 +-
 8 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 127eabc3..2d241e5c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,7 +20,7 @@ Changed
 - Simpler and safer authentication logic (#270)
 - Use token based auth to reset passwords (#269)
 - Better install doc (#275)
-- Use token based auth in invitation e-mails
+- Use token based auth in invitation e-mails (#280)
 
 Added
 =====
diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html
index 13866369..e4034d48 100644
--- a/ihatemoney/templates/list_bills.html
+++ b/ihatemoney/templates/list_bills.html
@@ -92,7 +92,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="identifier">{{ _("The project identifier is") }} <a href="{{ url_for(".list_bills") }}">{{ g.project.id }}</a>, {{ _("remember it!") }}</div>
+<div class="identifier"><a href="{{ url_for(".invite") }}">{{ _("Invite people to join this project!") }}</a></div>
 <a id="new-bill" href="{{ url_for(".add_bill") }}" class="btn btn-primary" data-toggle="modal" data-target="#bill-form">{{ _("Add a new bill") }}</a>
 
     <div id="bill-form" class="modal fade show" role="dialog">
diff --git a/ihatemoney/templates/reminder_mail.en b/ihatemoney/templates/reminder_mail.en
index f13da5df..5f9b7d81 100644
--- a/ihatemoney/templates/reminder_mail.en
+++ b/ihatemoney/templates/reminder_mail.en
@@ -3,7 +3,9 @@ Hi,
 You have just (or someone else using your email address) created the project "{{ g.project.name }}" to share your expenses.
 
 You can access it here: {{ url_for(".list_bills", _external=True) }} (the identifier is {{ g.project.id }}),
-and the private code is "{{ g.project.password }}".
+and the shared password is "{{ g.project.password }}".
+If you want to share this project with your friends, you can share the identifier and the shared password with them or send them invitations with the following link:
+{{ url_for(".invite", _external=True) }}
 
 Enjoy,
 Some weird guys (with beards)
diff --git a/ihatemoney/templates/reminder_mail.fr b/ihatemoney/templates/reminder_mail.fr
index 86c00ff4..fbe299a6 100644
--- a/ihatemoney/templates/reminder_mail.fr
+++ b/ihatemoney/templates/reminder_mail.fr
@@ -4,5 +4,7 @@ Vous venez de créer le projet "{{ g.project.name }}" pour partager vos dépense
 
 Vous pouvez y accéder ici: {{ url_for(".list_bills", _external=True) }} (l'identifieur est {{ g.project.id }}),
 et le code d'accès "{{ g.project.password }}".
+Si vous voulez partager ce projet avec vos amis, vous pouvez partager son identifiant et son code d'accès avec eux ou leur envoyer une invitation avec le lien suivant :
+{{ url_for(".invite", _external=True) }}
 
 Faites en bon usage !
diff --git a/ihatemoney/templates/send_invites.html b/ihatemoney/templates/send_invites.html
index 7b3bdc5f..cd963800 100644
--- a/ihatemoney/templates/send_invites.html
+++ b/ihatemoney/templates/send_invites.html
@@ -1,17 +1,15 @@
 {% extends "layout.html" %}
 
-{% block sidebar %}
-<ol>
-    <li>{{ _("Create the project") }}</li>
-    <li><strong>{{ _("Invite people") }}</strong></li>
-    <li><a href="{{ url_for(".list_bills") }}">{{ _("Use it!") }}</a></li>
-</ol>
-{% endblock %}
 {% block content %}
 <h2>{{ _("Invite people to join this project") }}</h2>
 <p>{{ _("Specify a (comma separated) list of email adresses you want to notify about the
 creation of this budget management project and we will send them an email for you.") }}</p>
-<p>{{ _("If you prefer, you can") }} <a href="{{ url_for(".list_bills") }}">{{ _("skip this step") }}</a> {{ _("and notify them yourself") }}</p>
+<p>{{ _("If you prefer, you can share the project identifier and the shared
+password by other communication means. Or even directly share the following link:") }}</br>
+<a href="{{ url_for(".authenticate", _external=True, token=g.project.generate_token()) }}">
+    {{ url_for(".authenticate", _external=True, token=g.project.generate_token()) }}
+</a>
+</p>
 
 {% include "display_errors.html" %}
 <form class="invites form-horizontal" method="post" accept-charset="utf-8">
diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.mo b/ihatemoney/translations/fr/LC_MESSAGES/messages.mo
index 7d3555b443ab664f2604bf6764cc175e012323d6..47b801d4f61bafde6443423ad1f7325ec73e465d 100644
GIT binary patch
delta 2583
zcmY+_4QQ2B9LMpqt7~r8=H{H!neOa;)n=xIWtwQdAkG%kC^Dq$_T;X+yVvfEZZmzb
zQc05~cbX&>jG`<w;hKU<CT3Y+Dp{fFY7`bR5z^iat?$qKgf;H=InQ~{bI$+&Kj+!)
zo!e9I_6{Am#qhI^-`n`DAE>LFKhF#@rhv;;I1)GGczhSDuop8hGuxO+n1w@dI%Z)b
z4#3AT2Nz*32GhExoklGk>(P&UFb_XOO>hb`@eC@EZ&86>##=CtS%+Z}4#iqj4pWiX
z%na1{d8m1pq5@cX<JvW51C4w-wxbr>iFz=Fn(!d9mO0^h2DR|_Sb{%${W(P6&Gj(6
z6?dS<?ZYzs0L!rti!pOB_gUXq8r4{hio5|CV-_HDn<w#hY(<rJ3o76@QRDWZo;!jH
z{1_JEDb%<hJ^w^i!cTNcv<6+3WGoHtnW?Cf*P}9D;Po#-jf<luSc}?<9#nvPQGpyr
z&2t=eR?ecf<_fA3+0?xh^RNfU=Nk7$Bwx~@3BN&2c**lB>cLFX9)W{Vm8!%doQGP-
zL6y`+i?85McmSv28$_SL3pf*>pe%a6C!hLP(b!K%CHA2*%p!f2vH~Yy9jXEWRG?90
zZnF+6a4UxJfOo%!L8`=LR04Bw3_gr1eZ({2($L{r>A4oQmtA-tcH?CH9QAtnsiz{J
zg*tqTkm{P%sLH*FTHs|Ijjy8SKj7UziVEl?Y904$uW=4_So*vHmr-ZoDzdimaiX-q
zaMXmQs0{B!o$h<R{)M=ie+UjLfZvCw11%)#TCVRwRd_M_Sl_rbX3_C1Qa$r2YT<L9
zKcE8WM{R))!YIhcDOiUZ--@hhVyFtdfZD<?ybHHs9UeoC{|!g5zPV0A6BlukRFWE0
zN$ap0??+Xp3AI21Ny=>W`g>3d?m@i;`%#DSWAC~TRk@3((*J>~*x#6~_rHwMdL3$!
z18+{CBJ4$#>;g`}0@Bulvr&g{DJrv0)W6twkX+0z)E0e$dhQgevYFIfiHtyvy8~S<
z^dJrG<y_=r9^=p5m_Vv--a?h`5GsR<s0v&`Rm#ssYo3v)3YDVzC!!XdiK_6UNG_%Y
zRjKDjQ-5XLMTZu84f&Y8-t}qJ{eGN?f8iROz`LXg-bdX(jH<{<R3hJ@0=kHLJ%2?#
zU(73Gu@RZd#7d|?Ntn%aFvje{&+s_Tz-^XqK0J?2xUe*x!66*W^;xXKZ1zPJ8Hd{I
z*;tQ_sLWqS9pc@nKtIA7Jnhoxq;U<|CezM01aF+_MjfghNG#?(ROwHkGW!Zu;$GAO
z{iyNRa0(6}?ddoTAHe5Pr9XmNxEEDHH>)xoSpn*GsYdPfIMg9pgc{i5UB^*@tVRX0
z78S@QROz>S{coeTbT{hxW2pI0qqgik5{TdQ)6j#3RjK`hcKdQ{tR)b2Y`n!ut|=&R
zZ6MsNi*$E$&ayx(wjvU3wu?J#g#M^)inO&Q!oj9MJQxYvHYX5{jkOI?>nwM|wmBGe
zn&P33o3q-dBB4-ZMKHX?hJxYNNoG!Xc_0*Ikw~i()>Sa>c-UphF8`?HdVg6)X=;am
zl`mDDJ3k}UJ>;k_6&QLwBiTM|LuyRn7a1AjQojs;WPsl;3q<3AB}5fUy5&W#6Spx1
z6^YwshnumO{zh#gYy*inX|_c=6s7b3EQmkhh3>RD;rM^1b%>fLVu|4L05>L?1q#~+
z(@FdrcxO6+WLt4fZaSk*+gz<BlTR0y`)p~dyLjus<fiiMRAb2{U#g*OzAt&OVrTND
H%7^{|yt-IE

delta 2543
zcmYM!eN5F=9LMnkTnZCG5S1t42Y5lq9)vXu!=(l!+N`OW%QA!?aPx96yY~k}eE1D}
za%C;MgN;^ZwpiL$+U<dnt`#GlS)0SHHK*3{kDlCW;L3%o_XmDk>~de{oO^!fe81mw
z?mfKr(i-<trmxTN_X7X<{0DvN{r`6&#h5vCPht+9!%F-OOR->vF$q|U)mV?|xEF86
zS1}1+!&~qmrs0ukT{A>uF$1S?CQjgN)NCz~fytPI3ZxJfXcgXs4`CK=!b}XJa&VCt
z%`>R^FQL{wiVEPfslIE>85$W3TtIDf74_gaYQae)CX-HdG6%JB2^M07H{O8r=x@MT
zxZQIH7Sn$obMYwZ`B5xme{+_GBA!5A<~nceX_8ZoDaYBUl2)SvZ9vW2f_knE6>vMw
z#V*vm{hkL=6*z`U@EcSm#?a;8T;WZn{u7n)b<}t&X=q{&YJm#W5!9msd<+#x3u=A@
zbw^y(kqn?ReIJYPV|*LGLj|%k&A3ww_HrOvu+Q@l>cRIg8$ZM{{2J%uIBKJrltm@=
zqlNdO#vAcx+=(l&nJhYS5Nk1?@@SoH8Pva&Mh^pid<&K7DO5?XU=?0PRicRUr~;M9
z+NKUwxkqpzK7m1e8a3|^RAqd0lu!m1U^c1(OI@!~gSuR+JRd}z?Iyejx8S|lkNTR8
zp)yFL&box9NL5W8s*)Q}mD`His2dmH9@IXsqvpATG!)r!)P_TzCy}Jhm)_^+QJG#q
z_BKDE7WfO5VInt=Q!(kN4GK`>i%_@!E^qu%JirgeHY6a|Oz@pi2AQO@7%NdnuoV+=
z7uKPRRMUKg3gmmwA5j7Qf;yrbn1^YkUxO8>`EAIarUO-x=P-r+&3+npFwlp$;V9~X
zapYzG;Y|x?akEq*KdRIfScZ3_D)l64g9z$(V4pYsCThdusBg=ss7pJdKKq+XG*rr8
zQAcqNRkBG`DGQmcOH+<2@dK!UHlZrkhMM1px|BnxgifP=djCcxGKpGmF6F7hLUdKq
z^)!@03u<CFssaa4XE=a5l0jU8BS@9aHB`lB@u31=hRS>;szRGl>$IXO6ZXcRMeP^M
zr~b<19R>)_e1a;`IaH<>Q5*e^y1hQ$)GtPTUX4p}HTGgJ>iHzfHFX(L6)8X^ayu%Z
zWvH*~ssie-1=<*}@DQ?w`2yL~Tt;4I(ld{ndWL>A-jB(aF}tw=oA5L$k;O%9hV@vA
zU8u^ufja7sa4mlB(oh9bIY8aw1*nLZph~y`7vVbW!EU7LW*qtEne>wB%e4@R$yA_@
zq5+lZ!#H&msC`;->h}O^=(~GptfX-Qm*c;v43<+LZM+#((!HnvUq<ewIgI*+Jb}6c
zqo~U@j+%eN>(B5{2Q&v2P%bK<V&q8Hm^-}>YEWlei(24u)a4AIHr|EW@D<eA4xj>j
z7j?Gh{PCWYV~P1@b*QT`7-+Vf@OC?-Ucj-f4m;ctv|~TaEQ$M4cPA!T@!quc3Gw0d
z%ZWZK;1tD%GyU=5%!>)xjiF{M6m|kFJ1nQoZnt)XJ0np$*b?i{dND6zx7+R8?1&yQ
z(d~f_<^-Zv)Ui9_*4*<62}|PF=50)heVaRfj@4{OtyVh}^<wC;nqx(ICGonveqXw6
zH4#)K{FLojcGQWVElf$8wb2O#15vxj3ffjtY_hmKK3RNgVm4EPEY;X$N1Q;!>I!#8
tt@e?l?J>XqgVJcYv&#<g%+#<QvWTm((;>tr+ad9hBTi$79UJqn`wt*rEUf?l

diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po
index c65342bc..b3440987 100644
--- a/ihatemoney/translations/fr/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/fr/LC_MESSAGES/messages.po
@@ -480,12 +480,12 @@ msgid "reactivate"
 msgstr "ré-activer"
 
 #: templates/list_bills.html:88
-msgid "The project identifier is"
-msgstr "L'identifiant de ce projet est"
+msgid "Invite"
+msgstr "Invitez"
 
 #: templates/list_bills.html:88
-msgid "remember it!"
-msgstr "souvenez vous en !"
+msgid "Invite people to join this project!"
+msgstr "Invitez d'autres personnes à rejoindre ce projet !"
 
 #: templates/list_bills.html:89
 msgid "Add a new bill"
@@ -539,14 +539,6 @@ msgstr "Vos projets"
 msgid "Reset your password"
 msgstr "Changez votre mot de passe"
 
-#: templates/send_invites.html:6
-msgid "Invite people"
-msgstr "Invitez des gens"
-
-#: templates/send_invites.html:7
-msgid "Use it!"
-msgstr "Utilisez le !"
-
 #: templates/send_invites.html:11
 msgid "Invite people to join this project"
 msgstr "Invitez des personnes à rejoindre ce projet"
@@ -554,7 +546,7 @@ msgstr "Invitez des personnes à rejoindre ce projet"
 #: templates/send_invites.html:12
 msgid ""
 "Specify a (comma separated) list of email adresses you want to notify "
-"about the \n"
+"about the\n"
 "creation of this budget management project and we will send them an email"
 " for you."
 msgstr ""
@@ -562,16 +554,11 @@ msgstr ""
 "par des virgules. On s'occupe de leur envoyer un email."
 
 #: templates/send_invites.html:14
-msgid "If you prefer, you can"
-msgstr "Si vous préférez vous pouvez"
-
-#: templates/send_invites.html:14
-msgid "skip this step"
-msgstr "sauter cette étape"
-
-#: templates/send_invites.html:14
-msgid "and notify them yourself"
-msgstr "et les avertir vous même"
+msgid "If you prefer, you can share the project identifier and the shared\n"
+"password by other communication means. Or even directly share the following link:"
+msgstr "Si vous préférez vous pouvez partager l'identifiant du projet et son mot "
+"de passe par un autre moyen de communication. Ou directement partager le lien "
+"suivant :"
 
 #: templates/settle_bills.html:31
 msgid "Who pays?"
diff --git a/ihatemoney/web.py b/ihatemoney/web.py
index b45424a7..e9532666 100644
--- a/ihatemoney/web.py
+++ b/ihatemoney/web.py
@@ -260,7 +260,7 @@ def create_project():
             # redirect the user to the next step (invite)
             flash(_("%(msg_compl)sThe project identifier is %(project)s",
                     msg_compl=msg_compl, project=project.id))
-            return redirect(url_for(".invite", project_id=project.id))
+            return redirect(url_for(".list_bills", project_id=project.id))
 
     return render_template("create_project.html", form=form)