diff options
Diffstat (limited to 'servo/templates')
-rwxr-xr-x | servo/templates/orders/dispatch.html | 12 | ||||
-rwxr-xr-x | servo/templates/orders/notes.html | 2 | ||||
-rwxr-xr-x | servo/templates/orders/products.html | 2 | ||||
-rwxr-xr-x | servo/templates/purchases/view_po.html | 82 | ||||
-rwxr-xr-x | servo/templates/shipments/list_bulk_returns.html | 6 | ||||
-rwxr-xr-x | servo/templates/shipments/list_incoming.html | 4 | ||||
-rwxr-xr-x | servo/templates/shipments/list_returns.html | 6 |
7 files changed, 59 insertions, 55 deletions
diff --git a/servo/templates/orders/dispatch.html b/servo/templates/orders/dispatch.html index f7ea0fb..41126c7 100755 --- a/servo/templates/orders/dispatch.html +++ b/servo/templates/orders/dispatch.html @@ -89,12 +89,12 @@ </tfoot> </table> </fieldset> - </div> - </div> - <div class="form-actions"> - <div class="pull-right"> - <a class="btn btn-default" href="{{ order.get_absolute_url }}">{% trans "Cancel" %}</a> - <button type="submit" class="btn btn-primary">{% trans "Dispatch" %}</button> + <div class="form-actions"> + <div class="pull-right"> + <a class="btn btn-default" href="{{ order.get_absolute_url }}">{% trans "Cancel" %}</a> + <button type="submit" class="btn btn-primary">{% trans "Dispatch" %}</button> + </div> + </div> </div> </div> </form> diff --git a/servo/templates/orders/notes.html b/servo/templates/orders/notes.html index 06cc61d..0e59e81 100755 --- a/servo/templates/orders/notes.html +++ b/servo/templates/orders/notes.html @@ -5,7 +5,7 @@ {% if not order.notes %} <div class="row-fluid"> - <div class="span12 well empty"><h3 class="muted">{% trans "Order doesn't contain any notes." %}</h3></div> + <div class="span12 well empty"><h3 class="muted">{% trans "Order doesn't contain any notes" %}</h3></div> </div> {% endif %} diff --git a/servo/templates/orders/products.html b/servo/templates/orders/products.html index 72540ab..e8185af 100755 --- a/servo/templates/orders/products.html +++ b/servo/templates/orders/products.html @@ -83,7 +83,7 @@ {% endwith %} {% empty %} <div class="row-fluid"> - <div class="span12 well empty"><h3 class="muted">{% trans "Order doesn't contain any products." %}</h3></div> + <div class="span12 well empty"><h3 class="muted">{% trans "Order doesn't contain any products" %}</h3></div> </div> {% endfor %} </tbody> diff --git a/servo/templates/purchases/view_po.html b/servo/templates/purchases/view_po.html index c43a058..cd9fad5 100755 --- a/servo/templates/purchases/view_po.html +++ b/servo/templates/purchases/view_po.html @@ -9,48 +9,48 @@ {% endblock filter_bar %} {% block detail_view %} - <div class="row"> - <div class="span4"> - <dl class="dl-horizontal"> - <dt>{% trans "Created By" %}</dt> - <dd>{{ po.created_by }}</dd> - <dt>{% trans "Created At" %}</dt> - <dd>{{ po.created_at|date:"SHORT_DATE_FORMAT" }}</dd> - <dt>{% trans "Sales Order" %}</dt> - <dd>{{ po.sales_order|default:"" }}</dd> - <dt>{% trans "Reference" %}</dt> - <dd>{{ po.reference }}</dd> - <dt>{% trans "Confirmation" %}</dt> - <dd>{{ po.confirmation }}</dd> - </dl> - </div> - <div class="span8"> - <table class="table"> - <thead> - <tr> - <th>{% trans "Product" %}</th> - <th>{% trans "Reference" %}</th> - <th>{% trans "Amount" %}</th> - <th>{% trans "Purchase Price" %}</th> - <th>{% trans "Received At" %}</th> - </tr> - </thead> - <tbody> - {% for i in po.purchaseorderitem_set.all %} - <tr> - <td><strong>{{ i.code }}</strong><br/>{{ i.title }}</td> - <td>{{ i.reference }}</td> - <td>{{ i.amount }}</td> - <td>{{ i.price|currency }}</td> - <td>{{ i.received_at|date:"SHORT_DATE_FORMAT"|default:"-" }}</td> - </tr> - {% endfor %} - </tbody> - </table> - </div> - </div> +<div class="row"> + <div class="span4"> + <dl class="dl-horizontal"> + <dt>{% trans "Created By" %}</dt> + <dd>{{ po.created_by }}</dd> + <dt>{% trans "Created At" %}</dt> + <dd>{{ po.created_at|date:"SHORT_DATE_FORMAT" }}</dd> + <dt>{% trans "Sales Order" %}</dt> + <dd>{{ po.sales_order|default:"" }}</dd> + <dt>{% trans "Reference" %}</dt> + <dd>{{ po.reference }}</dd> + <dt>{% trans "Confirmation" %}</dt> + <dd>{{ po.confirmation }}</dd> + </dl> + </div> + <div class="span8"> + <table class="table"> + <thead> + <tr> + <th>{% trans "Product" %}</th> + <th>{% trans "Reference" %}</th> + <th>{% trans "Amount" %}</th> + <th>{% trans "Purchase Price" %}</th> + <th>{% trans "Received At" %}</th> + </tr> + </thead> + <tbody> + {% for i in products %} + <tr> + <td><strong>{{ i.code }}</strong><br/>{{ i.title }}</td> + <td>{{ i.reference }}</td> + <td>{{ i.amount }}</td> + <td>{{ i.price|currency }}</td> + <td>{{ i.received_at|date:"SHORT_DATE_FORMAT"|default:"-" }}</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> +</div> {% endblock detail_view %} {% block crumbs %} - <li><a href="{% url 'purchases-list_pos' %}">{% trans "Purchase Orders" %}</a></li> + <li><a href="{% url 'purchases-list_pos' %}">{% trans "Purchase Orders" %}</a></li> {% endblock crumbs %} diff --git a/servo/templates/shipments/list_bulk_returns.html b/servo/templates/shipments/list_bulk_returns.html index f2c4843..fd393bb 100755 --- a/servo/templates/shipments/list_bulk_returns.html +++ b/servo/templates/shipments/list_bulk_returns.html @@ -26,6 +26,10 @@ <td>{{ i.num_parts }}</td> <td>{{ i.dispatched_by }}<br/><small class="muted">{{ i.dispatched_at|date:"SHORT_DATETIME_FORMAT" }}</small></td> </tr> + {% empty %} + <tr> + <td colspan="5" class="muted empty">{% trans "No bulk returns" %}</td> + </tr> {% endfor %} </tbody> </table> @@ -33,5 +37,5 @@ {% endblock second_column %} {% block breadcrumb %} -<li class="active"><span class="divider">/</span> {% trans "Browse Returns" %}</li> + <li class="active"><span class="divider">/</span> {% trans "Browse Returns" %}</li> {% endblock breadcrumb %} diff --git a/servo/templates/shipments/list_incoming.html b/servo/templates/shipments/list_incoming.html index 5d2d784..3c9da41 100755 --- a/servo/templates/shipments/list_incoming.html +++ b/servo/templates/shipments/list_incoming.html @@ -17,7 +17,7 @@ <th>{% trans "Part" %}</th> <th>{% trans "Service Order" %}</th> <th>{% trans "Confirmation" %}</th> - <th>{% trans "Ordered" %}</th> + <th>{% trans "Ordered By" %}</th> </tr> </thead> <tbody class="searchable"> @@ -57,5 +57,5 @@ {% endblock second_column %} {% block breadcrumb %} -<li class="active"><span class="divider">/</span><a href="{% url 'shipments-list_incoming' %}">{% trans "Incoming" %}</a></li> + <li class="active"><span class="divider">/</span><a href="{% url 'shipments-list_incoming' %}">{% trans "Incoming" %}</a></li> {% endblock breadcrumb %} diff --git a/servo/templates/shipments/list_returns.html b/servo/templates/shipments/list_returns.html index 7d57286..029d236 100755 --- a/servo/templates/shipments/list_returns.html +++ b/servo/templates/shipments/list_returns.html @@ -18,7 +18,7 @@ </tr> </thead> <tbody> - {% for p in parts %} + {% for p in parts %} <tr> <td><input type="checkbox" name="items" value="{{ p.returnOrderNumber }}"/></td> <td>{{ p.partNumber }}</td> @@ -28,11 +28,11 @@ <td>{{ p.registeredForReturn }}</td> <td>{{ p.kbbSerialNumber }}</td> </tr> - {% empty %} + {% empty %} <tr> <td colspan="7" class="muted empty">{% trans "No parts pending return" %}</td> </tr> - {% endfor %} + {% endfor %} </tbody> </table> <button type="submit" class="btn btn-primary pull-right" disabled="disabled">{% trans "Submit" %}</button> |