diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-02-18 04:55:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-02-18 04:55:58 +0100 |
| commit | 9d78e195c41f06386fd4cfb45094dfe486cd59af (patch) | |
| tree | 23d572cd884fa4bdeed89dd7e1df2f93a66c1701 /ishtar/templates/base.html | |
| parent | 3ecfdaa9d2592b6e986e68094f82aab8a93c6dfc (diff) | |
| download | Ishtar-9d78e195c41f06386fd4cfb45094dfe486cd59af.tar.bz2 Ishtar-9d78e195c41f06386fd4cfb45094dfe486cd59af.zip | |
Work on sheet mecanism (refs #227)
Diffstat (limited to 'ishtar/templates/base.html')
| -rw-r--r-- | ishtar/templates/base.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html index e7570e6c3..7bfc579bb 100644 --- a/ishtar/templates/base.html +++ b/ishtar/templates/base.html @@ -4,7 +4,6 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> @@ -16,6 +15,7 @@ <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script> <script language="javascript" type="text/javascript" src="{{MEDIA_URL}}/js/ishtar.js"></script> <link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" /> + <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> {% block extra_head %} {% endblock %} </head> @@ -23,14 +23,15 @@ <div id="header"> {% block header %} {% if user.is_authenticated %} - {% trans "Logged in" %}: {{ user.username }} - (<a href="{% url auth_logout %}">{% trans "Log out" %}</a> | + {% trans "Logged in" %}: {{ user.username }} + (<a href="{% url auth_logout %}">{% trans "Log out" %}</a> | <a href="{% url auth_password_change %}">{% trans "Change password" %}</a>) {% else %} <strong><a href="{% url auth_login %}">{% trans "Log in" %}</a></strong> {% endif %} {% endblock %} </div> + <div id="window"></div> <div id="logo"> {% if APP_NAME %}<p id="app_name">{{APP_NAME}}</p>{%endif%} </div> |