diff options
| author | zarkam <zarkam@zarkam.(none)> | 2011-01-29 13:24:20 +0100 |
|---|---|---|
| committer | zarkam <zarkam@zarkam.(none)> | 2011-01-29 13:24:20 +0100 |
| commit | c9a1754903035260f837c2a5d4ea9b6fe3a76ffb (patch) | |
| tree | d1d385f9f529231bf500550dce9f37342d8e8187 /ishtar/templates | |
| parent | 656f4a1e0d359b873d40c9df6ab951fb90637d10 (diff) | |
| parent | 0883d7029ebdb4a934407c95c19745b13fe558ca (diff) | |
| download | Ishtar-c9a1754903035260f837c2a5d4ea9b6fe3a76ffb.tar.bz2 Ishtar-c9a1754903035260f837c2a5d4ea9b6fe3a76ffb.zip | |
Merge branch 'master' of ssh://lysithea.proxience.com/home/proxience/git/ishtar
Diffstat (limited to 'ishtar/templates')
| -rw-r--r-- | ishtar/templates/base.html | 2 | ||||
| -rw-r--r-- | ishtar/templates/confirm_wizard.html | 2 | ||||
| -rw-r--r-- | ishtar/templates/default_wizard.html | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html index e726cf782..22e6d4239 100644 --- a/ishtar/templates/base.html +++ b/ishtar/templates/base.html @@ -16,6 +16,8 @@ <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" /> + {% block extra_head %} + {% endblock %} </head> <body> <div id="header"> diff --git a/ishtar/templates/confirm_wizard.html b/ishtar/templates/confirm_wizard.html index 5a92e0d58..371de39c3 100644 --- a/ishtar/templates/confirm_wizard.html +++ b/ishtar/templates/confirm_wizard.html @@ -15,7 +15,7 @@ <table class='confirm'> <caption>{{form_label}}</caption> {% for label, data, cls in form_data %} - <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th> + <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></tr> {% endfor %} </table> {% endfor %} diff --git a/ishtar/templates/default_wizard.html b/ishtar/templates/default_wizard.html index ff1bc7975..1666b4979 100644 --- a/ishtar/templates/default_wizard.html +++ b/ishtar/templates/default_wizard.html @@ -1,6 +1,9 @@ {% extends "base.html" %} {% load i18n %} {% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} {% block content %} <form action="." method="post">{% csrf_token %} <ul id='form_path'> @@ -26,7 +29,7 @@ {% endif %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -<input type="submit" value="{% trans "Validate" %}"/> +<input type="submit" id="submit_form" value="{% trans "Validate" %}"/> </div> </form> {% endblock %} |