From d2dd83c3a396ab862ef16ce157b00f0cc3d75a37 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 12 Dec 2013 13:57:58 +0530 Subject: [PATCH] fixed template loader webnotes/wnframework#351 --- .../templates/pages/invoice.html | 2 +- .../templates/pages/invoices.html | 2 +- erpnext/portal/templates/base.html | 4 ++-- erpnext/portal/templates/includes/footer.html | 2 +- erpnext/portal/templates/pages/cart.html | 2 +- .../portal/templates/sales_transactions.html | 2 +- .../sales_order/templates/pages/order.html | 2 +- .../sales_order/templates/pages/orders.html | 2 +- .../templates/generators/item_group.html | 8 ++++---- erpnext/startup/event_handlers.py | 4 ---- .../templates/pages/shipment.html | 2 +- .../templates/pages/shipments.html | 2 +- .../item/templates/generators/item.html | 14 +++++++------- .../templates/includes/product_in_grid.html | 2 +- .../templates/includes/product_in_list.html | 2 +- .../item/templates/pages/product_search.html | 4 ++-- .../templates/pages/tickets.html | 2 +- erpnext/translations/languages.json | 19 ------------------- 18 files changed, 27 insertions(+), 50 deletions(-) delete mode 100644 erpnext/translations/languages.json diff --git a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html index db6e009f89..44c5330849 100644 --- a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html +++ b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html @@ -1,4 +1,4 @@ -{% extends "app/portal/templates/sale.html" %} +{% extends "portal/templates/sale.html" %} {% block status -%} {% if doc.status %}{{ doc.status }}{% endif %} diff --git a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html index f108683cb9..f8ca76980f 100644 --- a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html +++ b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html @@ -1 +1 @@ -{% extends "app/portal/templates/sales_transactions.html" %} \ No newline at end of file +{% extends "portal/templates/sales_transactions.html" %} \ No newline at end of file diff --git a/erpnext/portal/templates/base.html b/erpnext/portal/templates/base.html index bc6fb9755c..3eb7adca8e 100644 --- a/erpnext/portal/templates/base.html +++ b/erpnext/portal/templates/base.html @@ -1,3 +1,3 @@ -{% extends "lib/website/templates/base.html" %} +{% extends "website/templates/base.html" %} -{% block footer %}{% include "app/portal/templates/includes/footer.html" %}{% endblock %} \ No newline at end of file +{% block footer %}{% include "portal/templates/includes/footer.html" %}{% endblock %} \ No newline at end of file diff --git a/erpnext/portal/templates/includes/footer.html b/erpnext/portal/templates/includes/footer.html index cd75fd16f6..9912c9cf0a 100644 --- a/erpnext/portal/templates/includes/footer.html +++ b/erpnext/portal/templates/includes/footer.html @@ -1,4 +1,4 @@ -{% extends "lib/website/templates/includes/footer.html" %} +{% extends "website/templates/includes/footer.html" %} {% block powered %}ERPNext Powered{% endblock %} diff --git a/erpnext/portal/templates/pages/cart.html b/erpnext/portal/templates/pages/cart.html index 1abe46787c..db812299f3 100644 --- a/erpnext/portal/templates/pages/cart.html +++ b/erpnext/portal/templates/pages/cart.html @@ -1,7 +1,7 @@ {% extends base_template %} {% block javascript %} - + {% endblock %} {% set title="Shopping Cart" %} diff --git a/erpnext/portal/templates/sales_transactions.html b/erpnext/portal/templates/sales_transactions.html index f4fd5d18cc..632793c85a 100644 --- a/erpnext/portal/templates/sales_transactions.html +++ b/erpnext/portal/templates/sales_transactions.html @@ -1,4 +1,4 @@ -{% extends "app/portal/templates/includes/transactions.html" %} +{% extends "portal/templates/includes/transactions.html" %} {% block javascript -%} + {% endblock %} {% block content %} @@ -17,7 +17,7 @@ $(document).ready(function() { }); -{% include "app/stock/doctype/item/templates/includes/product_search_box.html" %} +{% include "stock/doctype/item/templates/includes/product_search_box.html" %}

Search Results

diff --git a/erpnext/support/doctype/support_ticket/templates/pages/tickets.html b/erpnext/support/doctype/support_ticket/templates/pages/tickets.html index d99e6145d9..549c227981 100644 --- a/erpnext/support/doctype/support_ticket/templates/pages/tickets.html +++ b/erpnext/support/doctype/support_ticket/templates/pages/tickets.html @@ -1,4 +1,4 @@ -{% extends "app/portal/templates/includes/transactions.html" %} +{% extends "portal/templates/includes/transactions.html" %} {% block javascript -%} {{ super() }} diff --git a/erpnext/translations/languages.json b/erpnext/translations/languages.json deleted file mode 100644 index 9bffb5c9ff..0000000000 --- a/erpnext/translations/languages.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "中国（简体）": "zh-cn", - "中國（繁體）": "zh-tw", - "deutsch": "de", - "ελληνικά": "el", - "english": "en", - "español": "es", - "français": "fr", - "हिंदी": "hi", - "hrvatski": "hr", - "italiano": "it", - "nederlands": "nl", - "português brasileiro": "pt-BR", - "português": "pt", - "српски":"sr", - "தமிழ்": "ta", - "ไทย": "th", - "العربية":"ar" -} \ No newline at end of file