[website] [cleanup] separated website generation in framework and erpnext
diff --git a/website/templates/pages/404.html b/website/templates/pages/404.html
deleted file mode 100644
index 8a676ce..0000000
--- a/website/templates/pages/404.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "html/outer.html" %}
-
-{% set title="Not Found" %}
-
-{% block content %}
-<div class="content">
- <div class="layout-wrapper layout-main">
- <h3><i class="icon-exclamation-sign"></i> Page missing or moved</h3>
- <br>
- <p>We are very sorry for this, but the page you are looking for is missing
- (this could be because of a typo in the address) or moved.</p>
- </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/about.html b/website/templates/pages/about.html
index 380c543..0cbd562 100644
--- a/website/templates/pages/about.html
+++ b/website/templates/pages/about.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="About Us" %}
diff --git a/website/templates/pages/account.html b/website/templates/pages/account.html
index 8e8f4b4..fe2b858 100644
--- a/website/templates/pages/account.html
+++ b/website/templates/pages/account.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="My Account" %}
diff --git a/website/templates/pages/attributions.html b/website/templates/pages/attributions.html
index 9e4b50d..05e8e88 100644
--- a/website/templates/pages/attributions.html
+++ b/website/templates/pages/attributions.html
@@ -1,4 +1,4 @@
-{% extends "html/outer.html" %}
+{% extends "app/website/templates/html/outer.html" %}
{% block header %}
<style>
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index df258e1..7483c7c 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -1,11 +1,11 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% block javascript %}
- {% include "js/blog.js" %}
+ {% include "app/website/templates/js/blog.js" %}
{% endblock %}
{% block css %}
- {% include "css/blog.css" %}
+ {% include "app/website/templates/css/blog.css" %}
{% endblock %}
{% set title="Blog" %}
@@ -29,5 +29,5 @@
style="display:none;">More...</button>
</div>
</div>
-{% include 'html/blog_footer.html' %}
+{% include 'app/website/templates/html/blog_footer.html' %}
{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/contact.html b/website/templates/pages/contact.html
index 79bcb04..b9b3cd7 100644
--- a/website/templates/pages/contact.html
+++ b/website/templates/pages/contact.html
@@ -1,7 +1,7 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% block javascript %}
- {% include "js/contact.js" %}
+ {% include "app/website/templates/js/contact.js" %}
{% endblock %}
{% set title="Contact Us" %}
diff --git a/website/templates/pages/error.html b/website/templates/pages/error.html
deleted file mode 100644
index 2be810d..0000000
--- a/website/templates/pages/error.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "html/outer.html" %}
-
-{% set title="Error" %}
-
-{% block content %}
-<div class="content">
- <div class="layout-wrapper layout-main">
- <h3><i class="icon-exclamation-sign"></i> Oops, a server error has occured</h3>
- <br>
- <pre>%(error)s</pre>
- </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/index.html b/website/templates/pages/index.html
index 1307872..761da0c 100644
--- a/website/templates/pages/index.html
+++ b/website/templates/pages/index.html
@@ -1 +1 @@
-{% extends "html/web_page.html" %}
\ No newline at end of file
+{% extends "app/website/templates/html/web_page.html" %}
\ No newline at end of file
diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html
deleted file mode 100644
index 6b847ff..0000000
--- a/website/templates/pages/login.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% extends "html/base.html" %}
-
-{% block header %}
- <script>
- {% include "js/login.js" %}
- </script>
- {% include "css/login.css" %}
-{% endblock %}
-
-{% set title="Login" %}
-
-{% block body %}
- <div class="container" id='login_wrapper'>
- <div class='layout-wrapper layout-main'>
- <p id="login_message" class="alert" style="display: none;"></p>
- <h3><i class="icon-lock" style="margin-top: 7px"></i> Login</h3>
- <form autocomplete="on">
- <table border="0" class="login-box">
- <tbody>
- <tr>
- <td style="text-align: right; padding: 3px;"
- id="login-label">Login Id</td>
- <td><input id="login_id" type="text" style="width: 180px"/></td>
- </tr>
- <tr id="password-row">
- <td style="text-align: right; padding: 3px;" >Password</td>
- <td><input id="password" type="password" style="width: 180px" /></td>
- </tr>
- <tr id="full-name-row" style="display: none;">
- <td style="text-align: right; padding: 3px;">Full Name</td>
- <td><input id="full_name" type="text" style="width: 180px" /></td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <button type="submit" id="login_btn"
- class="btn btn-small btn-primary">Login</button>
- <img src="lib/images/ui/button-load.gif" id="login-spinner"
- style="display: none;">
- </td>
- </tr>
- </tbody>
- </table>
- </form>
- <br>
- <p style="text-align: center" id="forgot-wrapper">
- <a id="forgot-password" style="cursor:pointer"
- onclick="return login.show_forgot_password()">Forgot Password</a></p>
- <p style="text-align: center" id="sign-up-wrapper">
- New user? <a id="sign-up" style="cursor:pointer"
- onclick="return login.sign_up()">Sign Up</a></p>
- </div>
- </div>
- <div class="web-footer login-footer container">
- <a href="index.html">Home</a> |
- <a href="https://erpnext.com">ERPNext</a><br><br>
- {% if copyright %}
- <div class="web-footer-copyright">© {{ copyright }}
- {% endif %}
- </div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/message.html b/website/templates/pages/message.html
deleted file mode 100644
index ea9e14e..0000000
--- a/website/templates/pages/message.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "html/outer.html" %}
-
-{% set title=webnotes.message_title %}
-
-{% block content %}
-<div class="content">
- <div class="layout-wrapper layout-main">
- {{ webnotes.message }}
- </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/order.html b/website/templates/pages/order.html
index 9e80694..8e7bfe7 100644
--- a/website/templates/pages/order.html
+++ b/website/templates/pages/order.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title=doc.name %}
diff --git a/website/templates/pages/orders.html b/website/templates/pages/orders.html
index 3bb7bd4..0c93a68 100644
--- a/website/templates/pages/orders.html
+++ b/website/templates/pages/orders.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="My Orders" %}
diff --git a/website/templates/pages/print.html b/website/templates/pages/print.html
deleted file mode 100644
index b684dfe..0000000
--- a/website/templates/pages/print.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Print Format</title>
- <meta name="generator" content="wnframework">
- <style>
- {{ css }}
- </style>
-</head>
-<body>
- {{ body }}
-</body>
-{%- if comment -%}
-<!-- {{ comment }} -->
-{%- endif -%}
-</html>
\ No newline at end of file
diff --git a/website/templates/pages/product_search.html b/website/templates/pages/product_search.html
index 66bf160..2dab6ff 100644
--- a/website/templates/pages/product_search.html
+++ b/website/templates/pages/product_search.html
@@ -1,9 +1,9 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="Product Search" %}
{% block javascript %}
-{% include "js/product_list.js" %}
+{% include "app/website/templates/js/product_list.js" %}
{% endblock %}
{% block content %}
@@ -17,7 +17,7 @@
});
</script>
-{% include 'html/product_search_box.html' %}
+{% include 'app/website/templates/html/product_search_box.html' %}
<div class="span12">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">
diff --git a/website/templates/pages/profile.html b/website/templates/pages/profile.html
index 1b9350c..d689cfb 100644
--- a/website/templates/pages/profile.html
+++ b/website/templates/pages/profile.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="My Profile" %}
diff --git a/website/templates/pages/ticket.html b/website/templates/pages/ticket.html
index fe185f8..858dd3b 100644
--- a/website/templates/pages/ticket.html
+++ b/website/templates/pages/ticket.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title=doc.name %}
diff --git a/website/templates/pages/tickets.html b/website/templates/pages/tickets.html
index 11da329..843d10e 100644
--- a/website/templates/pages/tickets.html
+++ b/website/templates/pages/tickets.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="My Tickets" %}
diff --git a/website/templates/pages/writers.html b/website/templates/pages/writers.html
index bba3749..67c0b7e 100644
--- a/website/templates/pages/writers.html
+++ b/website/templates/pages/writers.html
@@ -1,4 +1,4 @@
-{% extends "html/page.html" %}
+{% extends "app/website/templates/html/page.html" %}
{% set title="Blog Writers" %}
@@ -10,8 +10,8 @@
{% endif %}
<hr>
{% for blogger_info in bloggers %}
- {% include "html/blogger.html" %}
+ {% include "app/website/templates/html/blogger.html" %}
{% endfor %}
</div>
-{% include 'html/blog_footer.html' %}
+{% include 'app/website/templates/html/blog_footer.html' %}
{% endblock %}
\ No newline at end of file