[cleanup] [website]
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index a97e658..6891bce 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 %}<h2>{{ _("My Cart") }}</h2>{% endblock %}
-{% block script %}{% include "templates/includes/cart.js" %}{% endblock %}
-{% block style %}{% include "templates/includes/cart.css" %}{% endblock %}
+{% block script %}
+<script>{% include "templates/includes/cart.js" %}</script>
+{% endblock %}
+
+{% block style %}
+<style>
+ {% include "templates/includes/cart.css" %}
+</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 82ad6fa..f10e0a3 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 %}<h2>My Profile</h2>{% endblock %}
-{% block content %}
+{% block page_content %}
<div class="user-content" style="max-width: 500px;">
<div class="alert alert-warning" id="message" style="display: none;"></div>
<form>
@@ -26,7 +28,7 @@
</form>
</div>
<script>
-$(document).ready(function() {
+frappe.ready(function() {
$("#fullname").val(getCookie("full_name") || "");
$("#update_user").click(function() {
frappe.call({
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 45f6af0..26dbed6 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -1,11 +1,17 @@
+{% extends "templates/web.html" %}
+
{% block header %}
<h1>{{ doc.name }}</h1>
<!-- <h6 class="text-muted">{{ doc._title or doc.doctype }}</h6> -->
{% endblock %}
-{% block style %}{% include "templates/includes/order/order.css" %}{% endblock %}
+{% block style %}
+<style>
+ {% include "templates/includes/order/order.css" %}
+</style>
+{% endblock %}
-{% block content %}
+{% block page_content %}
{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
diff --git a/erpnext/templates/pages/partners.html b/erpnext/templates/pages/partners.html
index 9c87f44..132c06b 100644
--- a/erpnext/templates/pages/partners.html
+++ b/erpnext/templates/pages/partners.html
@@ -1,8 +1,10 @@
+{% extends "templates/web.html" %}
+
{% block title %} {{ title }} {% endblock %}
{% block header %}<h2>{{ title }}</h2>{% endblock %}
-{% block content %}
+{% block page_content %}
<div class="partners-content">
{% for partner_info in partners %}
<div class="row">
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index 07e6c6e..2d80cf4 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -1,3 +1,5 @@
+{% extends "templates/web.html" %}
+
{% block title %} {{ "Product Search" }} {% endblock %}
{% block header %}<h2>Product Search</h2>{% endblock %}
@@ -6,11 +8,11 @@
{% include 'templates/includes/product_search_box.html' %}
{% endblock %}
-{% block content %}
+{% block page_content %}
<script>{% include "templates/includes/product_list.js" %}</script>
<script>
-$(document).ready(function() {
+frappe.ready(function() {
var txt = get_url_arg("q");
$(".search-results").html("Search results for: " + txt);
window.search = txt;