diff options
| author | Guillaume Horel <guillaume.horel@gmail.com> | 2012-11-07 20:23:12 -0500 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2012-11-07 20:23:12 -0500 |
| commit | e5ecbccd2aba5b7ce0c8ab363e2a5502f5c6b8c9 (patch) | |
| tree | df558168fcac1e382df1e83dd98e11c1f1d93379 | |
| parent | 101f820153cdb047d13166672d3f46cfef31677d (diff) | |
| download | famille-flask-e5ecbccd2aba5b7ce0c8ab363e2a5502f5c6b8c9.tar.gz | |
Saner layouts
the login page should look fine now.
| -rw-r--r-- | templates/layout.html | 34 | ||||
| -rw-r--r-- | templates/login.html | 7 |
2 files changed, 21 insertions, 20 deletions
diff --git a/templates/layout.html b/templates/layout.html index f5a5395..39e00a8 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -7,26 +7,28 @@ <!-- <link rel="alternate" type="application/rss+xml" title="Les actualités" href="rss.xml" /> --> </head> <body> + {% block body %} <div class="container"> <div class="sheet"> <div class="top"> - {{ session['user_name']}} + {{session['user_name']}} (<a href="/user/edit">Mon compte</a> | <a href="/logout">Se déconnecter</a>)</p> - </div> - <div class="main_menu"> - <table> - <tr> - <td><a href="/">Accueil</a></td> - <td><a href="/article/">Articles</a></td> - <td><a href="/user/">Famille</a></td> - <td><a href="/system/">Système</a></td> - </tr> - </table> - </div> - <div class="main"> - {% block content %}{% endblock %} - </div> + </div> + <div class="main_menu"> + <table> + <tr> + <td><a href="/">Accueil</a></td> + <td><a href="/article/">Articles</a></td> + <td><a href="/user/">Famille</a></td> + <td><a href="/system/">Système</a></td> + </tr> + </table> + </div> + <div class="main"> + {% block content %}{% endblock %} </div> </div> - </body> + </div> + {% endblock body %} +</body> </html> diff --git a/templates/login.html b/templates/login.html index d1b94ee..d2bb8cb 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,8 +1,6 @@ {% extends "layout.html" %} -{% block content %} - -<h2>Login</h2> -{% if error %}<p class=error><strong>Error:</strong> {{ error }}{% endif %} +{%block title %}Connexion{% endblock %} +{% block body %} <form id = "connection" action="{{ url_for('login') }}" method="post"> <fieldset> <legend>Connexion</legend> @@ -13,5 +11,6 @@ <input type="password" id="password" name=password /><br/> </p> <p class="submit"><input type="submit" value="Se connecter"/></p> + {% if error %}<p class=error><strong>Erreur:</strong> {{ error }}</p>{% endif %} </form> {% endblock %} |