diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html index 500a11853eb..8a2dcf2af38 100644 --- a/erpnext/templates/generators/item.html +++ b/erpnext/templates/generators/item.html @@ -1,3 +1,5 @@ +{% extends "templates/web.html" %} + {% block title %} {{ title }} {% endblock %} {% block header %}

{{ title }}

{% endblock %} @@ -6,7 +8,7 @@ {% include 'templates/includes/product_search_box.html' %} {% endblock %} -{% block content %} +{% block page_content %} {% from "erpnext/templates/includes/macros.html" import product_image %}
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html index 2652f6f74dc..2cfb9346604 100644 --- a/erpnext/templates/generators/item_group.html +++ b/erpnext/templates/generators/item_group.html @@ -1,8 +1,10 @@ +{% extends "templates/web.html" %} + {% block header_actions %} {% include 'templates/includes/product_search_box.html' %} {% endblock %} -{% block content %} +{% block page_content %}
{% if slideshow %} @@ -27,17 +29,6 @@ {% endif %}
- - {% endblock %} {% block style %} diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html index 2a07448fff0..6da6ad0fe22 100644 --- a/erpnext/templates/generators/sales_partner.html +++ b/erpnext/templates/generators/sales_partner.html @@ -1,8 +1,10 @@ +{% extends "templates/web.html" %} + {% block title %} {{ title }} {% endblock %} {% block header %}

{{ title }}

{% endblock %} -{% block content %} +{% block page_content %}
diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html index f6ec819bd55..15dcb951967 100644 --- a/erpnext/templates/includes/address_row.html +++ b/erpnext/templates/includes/address_row.html @@ -1,5 +1,5 @@
{% endif %} diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html index 2935a24ea4c..c090f93ebec 100644 --- a/erpnext/templates/includes/issue_row.html +++ b/erpnext/templates/includes/issue_row.html @@ -1,5 +1,5 @@
- +
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js index cec4f2a6a65..0a38c23f9b4 100644 --- a/erpnext/templates/includes/product_page.js +++ b/erpnext/templates/includes/product_page.js @@ -86,7 +86,7 @@ frappe.ready(function() { return; } - frappe.load_via_ajax(window.location.pathname + "?variant=" + item_code); + window.location.href = window.location.pathname + "?variant=" + item_code; }); }); diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html index 9b9fd52350e..7c03579748c 100644 --- a/erpnext/templates/includes/transaction_row.html +++ b/erpnext/templates/includes/transaction_row.html @@ -1,5 +1,5 @@
- +
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html index a97e65876c8..6891bceb1bd 100644 --- a/erpnext/templates/pages/cart.html +++ b/erpnext/templates/pages/cart.html @@ -1,9 +1,18 @@ +{% extends "templates/web.html" %} + {% block title %} {{ "Shopping Cart" }} {% endblock %} {% block header %}

{{ _("My Cart") }}

{% endblock %} -{% block script %}{% include "templates/includes/cart.js" %}{% endblock %} -{% block style %}{% include "templates/includes/cart.css" %}{% endblock %} +{% block script %} + +{% endblock %} + +{% block style %} + +{% endblock %} {% block header_actions %} @@ -14,7 +23,7 @@ {% endif %} {% endblock %} -{% block content %} +{% block page_content %} {% from "templates/includes/macros.html" import item_name_and_description %} diff --git a/erpnext/templates/pages/edit-profile.html b/erpnext/templates/pages/edit-profile.html index 82ad6fa0765..f10e0a3526a 100644 --- a/erpnext/templates/pages/edit-profile.html +++ b/erpnext/templates/pages/edit-profile.html @@ -1,8 +1,10 @@ +{% extends "templates/web.html" %} + {% block title %} {{ "My Profile" }} {% endblock %} {% block header %}

My Profile

{% endblock %} -{% block content %} +{% block page_content %}
@@ -26,7 +28,7 @@