diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 18:43:47 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 18:43:47 +0100 |
| commit | 1fe6a52803b4d78f57f52cdbe138010cc4c00f80 (patch) | |
| tree | 3eb44592abefec9ab8a2ee0981eba4ada17d9a1a /papillon/templates/base.html | |
| parent | 3fcdf69304580650c6244165aae0b1fc46221cff (diff) | |
| parent | 525fdda2aaae3adc8534ebda777dedddb17ef25f (diff) | |
| download | Papillon-1fe6a52803b4d78f57f52cdbe138010cc4c00f80.tar.bz2 Papillon-1fe6a52803b4d78f57f52cdbe138010cc4c00f80.zip | |
Merge branch 'responsive' of https://github.com/Trim/papillon into responsive
Conflicts:
papillon/templates/base.html
Diffstat (limited to 'papillon/templates/base.html')
| -rw-r--r-- | papillon/templates/base.html | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/papillon/templates/base.html b/papillon/templates/base.html index c235686..af4a815 100644 --- a/papillon/templates/base.html +++ b/papillon/templates/base.html @@ -2,26 +2,26 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="stylesheet" href="{% static 'styles.css' %}" /> - <title>{% block title %}Papillon{% endblock %}</title> - {% block fullscript %}{% endblock %} + <link rel="stylesheet" href="{% static 'styles.css' %}" /> + <title>{% block title %}Papillon{% endblock %}</title> + {% block fullscript %}{% endblock %} </head> <body> -<div id="main"> -<div id="header"> -<span id='languages'>{% for language in languages%}<a href='?language={{language.0}}'>{{language.1}}</a>{% endfor %}</span> -</div> -<div id="top"> - <h1><a href="{% url 'index' %}">Papillon</a></h1> -</div> -<div id="content"> -{% block content %}{% endblock %} -</div> -<div id="footer"> -<a href='http://blog.peacefrogs.net/nim/papillon/'>Papillon</a> - <a href='http://www.gnu.org/licenses/gpl.html'>Copyright</a> © 2008-2013 <a href='http://redmine.peacefrogs.net/projects/show/papillon'>Papillon project</a> -</div> -</div> + <div id="main"> + <div id="header"> + <span id='languages'>{% for language in languages%}<a href='?language={{language.0}}'>{{language.1}}</a>{% endfor %}</span> + </div> + <div id="top"> + <h1><a href="{% url 'index' %}">Papillon</a></h1> + </div> + <div id="content"> + {% block content %}{% endblock %} + </div> + <div id="footer"> + <a href='http://blog.peacefrogs.net/nim/papillon/'>Papillon</a> - <a href='http://www.gnu.org/licenses/gpl.html'>Copyright</a> © 2008-2013 <a href='http://redmine.peacefrogs.net/projects/show/papillon'>Papillon project</a> + </div> + </div> </body> </html> |