diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:05:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:05:13 +0200 |
| commit | dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4 (patch) | |
| tree | 4fdfe0c828e975812fdc6a8ededba4995300ecc2 /ishtar_common/templates/base.html | |
| parent | 5f77b4d18fdd1f4b8c6e967d65dc949197a28243 (diff) | |
| parent | 6bcaf64532e8b1ea76e5e74e3291fac2b238f838 (diff) | |
| download | Ishtar-dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4.tar.bz2 Ishtar-dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/views.py
Diffstat (limited to 'ishtar_common/templates/base.html')
| -rw-r--r-- | ishtar_common/templates/base.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 578b3edcc..1bab3d647 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -74,7 +74,7 @@ <td> <select class='{{main_cls}}' id='current_{{model_name}}'> <option class='normal' value=''>--</option> - {% for val, label, selected, cls in items %}<option class='{{cls}}' value='{{val}}'{%if selected%} selected="selected"{%endif%}>{{label}}</option> + {% for val, label, selected, cls in items %}<option class='{{cls}}' value='{{val}}'{% if selected %} selected="selected"{%endif%}>{{label}}</option> {% endfor %}</select> </td>{% with 'show-'|add:model_name as model_url%} <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></td> @@ -87,7 +87,7 @@ {% endif %}{% endblock %} </div>{% endif %} {% if reminders %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend> -{% for lbl, value in reminders%} +{% for lbl, value in reminders %} <p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p> {% endfor %} </fieldset>{%endif%} |