diff options
| author | Thibaut Horel <thibaut.horel@gmail.com> | 2015-04-07 19:07:29 -0400 |
|---|---|---|
| committer | Thibaut Horel <thibaut.horel@gmail.com> | 2015-04-07 19:07:29 -0400 |
| commit | 14a6ca1fa68ccd471066725759da6cdbd24761dd (patch) | |
| tree | 3000d0d22e652a082197c0b6decc8498d040ba85 /templates | |
| parent | 0a9eefd31c92e408ca66e615c3d9d27310b223b1 (diff) | |
| parent | d26b5e0f3a0f79a6b8165004e19b65df836b1e08 (diff) | |
| download | famille-flask-14a6ca1fa68ccd471066725759da6cdbd24761dd.tar.gz | |
Merge branch 'production'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/layout.html | 12 | ||||
| -rw-r--r-- | templates/user/show.html | 4 |
2 files changed, 9 insertions, 7 deletions
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 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"> - <link rel="stylesheet" media="screen" type="text/css" href="{{ url_for('static', filename = 'bootstrap-cosmo.min.css') }}" /> - <link rel="stylesheet" media="screen" type="text/css" href="{{ url_for('static', filename = 'main.css') }}" /> + <link rel="stylesheet" media="screen" type="text/css" href="{{ url_for('static', filename = 'css/bootstrap-cosmo.min.css') }}" /> + <link rel="stylesheet" media="screen" type="text/css" href="{{ url_for('static', filename = 'css/main.css') }}" /> <link rel="alternate" type="application/rss+xml" title="Les actualités" href='rss.xml' /> </head> <body> @@ -29,14 +29,14 @@ </div> {% endblock body %} <script type="text/javascript" - src="{{ url_for('static', filename='jquery.min.js')}}"></script> + src="{{ url_for('static', filename='js/jquery.min.js')}}"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js')}}"></script> <script type="text/javascript" - src="{{ url_for('static', filename='famille.js')}}"></script> + src="{{ url_for('static', filename='js/famille.js')}}"></script> <script type="text/javascript" - src="{{ url_for('static', filename='jquery.timeago.js')}}"></script> + src="{{ url_for('static', filename='js/jquery.timeago.js')}}"></script> <script type="text/javascript" - src="{{ url_for('static', filename='jquery.timeago.fr.js')}}"> + src="{{ url_for('static', filename='js/jquery.timeago.fr.js')}}"> </script> </body> </html> 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 @@ <tr><th>Fête</th><td>{{user.nameday or ""}}</td></tr> <tr><th>Adresse</th><td><address> {{user.address_line1 or ""}}<br/> - {{user.address_line2 or ""}}<br/> + {% if user.address_line2 %} + {{user.address_line2}}<br/> + {% endif %} {{user.address_city_line or ""}}</address> </td></tr> <tr><th>Dernière connexion</th><td>{{user.last_seen|format_date}}</td></tr> |