From d4874db3d2db48995b12381e379108ed32d35096 Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Tue, 7 Apr 2015 15:31:34 -0400 Subject: Reorganize assets --- templates/layout.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/layout.html b/templates/layout.html index 6ac0a20..ed70fb5 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -5,8 +5,8 @@ - - + + @@ -29,14 +29,14 @@ {% endblock body %} + src="{{ url_for('static', filename='js/jquery.min.js')}}"> + src="{{ url_for('static', filename='js/famille.js')}}"> + src="{{ url_for('static', filename='js/jquery.timeago.js')}}"> -- cgit v1.3 From d26b5e0f3a0f79a6b8165004e19b65df836b1e08 Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Tue, 7 Apr 2015 15:32:27 -0400 Subject: Do not show empty line when there is no second line in the address --- templates/user/show.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/user/show.html b/templates/user/show.html index 20464ce..3d06ea6 100644 --- a/templates/user/show.html +++ b/templates/user/show.html @@ -11,7 +11,9 @@ Fête{{user.nameday or ""}} Adresse

{{user.address_line1 or ""}}
- {{user.address_line2 or ""}}
+ {% if user.address_line2 %} + {{user.address_line2}}
+ {% endif %} {{user.address_city_line or ""}}

Dernière connexion{{user.last_seen|format_date}} -- cgit v1.3