diff options
Diffstat (limited to 'servo/templates')
-rw-r--r-- | servo/templates/admin/statuses/remove.html | 6 | ||||
-rwxr-xr-x | servo/templates/generic/delete.html | 12 | ||||
-rwxr-xr-x | servo/templates/notes/search.html | 6 | ||||
-rwxr-xr-x | servo/templates/orders/toolbar.html | 4 |
4 files changed, 13 insertions, 15 deletions
diff --git a/servo/templates/admin/statuses/remove.html b/servo/templates/admin/statuses/remove.html index 78385a6..1040017 100644 --- a/servo/templates/admin/statuses/remove.html +++ b/servo/templates/admin/statuses/remove.html @@ -2,15 +2,15 @@ {% load i18n %} {% block header %} - <h2>{% blocktrans with status.title as title %}Delete status "{{ title }}"?{% endblocktrans %}</h2> + {% blocktrans with status.title as title %}Delete status "{{ title }}"?{% endblocktrans %} {% endblock header %} {% block body %} - <p>{% trans "This action cannot be undone." %}</p> + {% trans "This action cannot be undone." %}</p> {% endblock body %} {% block footer %} - <form action="{{ action }}" method="post"> + <form action="{{ request.path }}" method="post"> {% csrf_token %} <button type="submit" class="btn btn-danger">{% trans "Delete" %}</button> </form> diff --git a/servo/templates/generic/delete.html b/servo/templates/generic/delete.html index 0503ce5..a8fa789 100755 --- a/servo/templates/generic/delete.html +++ b/servo/templates/generic/delete.html @@ -2,16 +2,16 @@ {% load i18n %} {% block header %} - {{ title }} + {{ title }} {% endblock header %} {% block body %} - {{ explanation }} + {{ explanation }} {% endblock body %} {% block footer %} - <form method="post" action="{{ action }}"> - {% csrf_token %} - <button type="submit" class="btn btn-danger">{% trans "Delete" %}</button> - </form> +<form method="post" action="{{ action|default:request.path }}"> + {% csrf_token %} + <button type="submit" class="btn btn-danger">{% trans "Delete" %}</button> +</form> {% endblock footer %} diff --git a/servo/templates/notes/search.html b/servo/templates/notes/search.html index 023bb07..e9c1842 100755 --- a/servo/templates/notes/search.html +++ b/servo/templates/notes/search.html @@ -1,16 +1,14 @@ {% extends "notes/list_notes.html" %} -{% load servo_tags %} -{% load humanize %} {% load i18n %} {% block toolbar %} - <a href="{% url 'notes-create' %}" class="btn"><i class="icon-plus"></i> {% trans "Create Note" %}</a> + <a href="{% url 'notes-create' %}" class="btn"><i class="icon-plus"></i> {% trans "New Note" %}</a> {% endblock toolbar %} {% block content %} <div class="page-header"> - <h1>{{ title }} <small>{{ subtitle }}</small></h1> + <h2>{{ title }} <small>{{ subtitle }}</small></h2> </div> {% include "notes/search-results.html" %} diff --git a/servo/templates/orders/toolbar.html b/servo/templates/orders/toolbar.html index 40a1405..425833c 100755 --- a/servo/templates/orders/toolbar.html +++ b/servo/templates/orders/toolbar.html @@ -82,9 +82,9 @@ <li><a href="{% url 'orders-toggle_follow' order.pk %}">{% trans "Follow Order" %}</a></li> {% endif %} {% if perms.servo.add_order and perms.servo.copy_order %} - <li><a href="{% url 'orders-copy_order' order.pk %}">{% trans "Copy Order" %}</a></li> + <li><a href="{% url 'orders-copy_order' order.pk %}">{% trans "Duplicate Order" %}</a></li> {% else %} - <li><a class="disabled" href="#">{% trans "Copy Order" %}</a></li> + <li><a class="disabled" href="#">{% trans "Duplicate Order" %}</a></li> {% endif %} <li><a href="{% url 'barcodes-view' order.code %}?f=svg" target="_blank">{% trans "Show Barcode" %}</a></li> <li class="divider"></li> |