+
{% if doc.headline %}
{{ doc.headline }}
{% endif %}
diff --git a/erpnext/website/page/about/__init__.py b/erpnext/website/page/about/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/website/page/about/about.txt b/erpnext/website/page/about/about.txt
new file mode 100644
index 00000000000..7e045de50fc
--- /dev/null
+++ b/erpnext/website/page/about/about.txt
@@ -0,0 +1,42 @@
+# Page, about
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-01-27 11:37:57',
+ 'docstatus': 0,
+ 'modified': '2012-01-27 11:37:57',
+ 'modified_by': 'Administrator',
+ 'owner': 'Administrator'
+ },
+
+ # These values are common for all Page
+ {
+ 'doctype': 'Page',
+ 'module': 'Website',
+ 'name': '__common__',
+ 'page_name': 'about',
+ 'standard': 'Yes'
+ },
+
+ # These values are common for all Page Role
+ {
+ 'doctype': 'Page Role',
+ 'name': '__common__',
+ 'parent': 'about',
+ 'parentfield': 'roles',
+ 'parenttype': 'Page',
+ 'role': 'Guest'
+ },
+
+ # Page, about
+ {
+ 'doctype': 'Page',
+ 'name': 'about'
+ },
+
+ # Page Role
+ {
+ 'doctype': 'Page Role'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/website/page/contact/__init__.py b/erpnext/website/page/contact/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/website/page/contact/contact.js b/erpnext/website/page/contact/contact.js
new file mode 100644
index 00000000000..e05023b3664
--- /dev/null
+++ b/erpnext/website/page/contact/contact.js
@@ -0,0 +1,30 @@
+pscript.onload_contact = function(wrapper) {
+ $('#content-contact-us .btn.primary').click(function() {
+ var me = this;
+ var args = {};
+ args.name = $('#content-contact-us [name="contact-name"]').val();
+ args.email = $('#content-contact-us [name="contact-email"]').val();
+ args.message = $('#content-contact-us [name="contact-message"]').val();
+
+ if(!validate_email(args.email)) {
+ msgprint('Please enter a valid email id');
+ return;
+ }
+
+ if(args.name && args.email && args.message) {
+ $(this).set_working();
+ $c_page('website', 'contact', 'send', args, function(r) {
+ $('#content-contact-us [name*="contact"]').val('');
+ $(me).done_working();
+ });
+ } else {
+ msgprint("Please enter info in all the fields.")
+ }
+ });
+
+ $('#content-contact-us :input').keyup(function(ev) {
+ if(ev.which == 13) {
+ $('#content-contact-us .btn.primary').click();
+ }
+ });
+}
\ No newline at end of file
diff --git a/erpnext/website/page/contact/contact.py b/erpnext/website/page/contact/contact.py
new file mode 100644
index 00000000000..a6566a9b847
--- /dev/null
+++ b/erpnext/website/page/contact/contact.py
@@ -0,0 +1,15 @@
+import json, webnotes
+
+def send(args):
+ """create support ticket"""
+ args = json.loads(args)
+
+ from webnotes.model.doc import Document
+ d = Document('Support Ticket')
+ d.raised_by = args['email']
+ d.description = 'From: ' + args['name'] + '\n\n' + args['message']
+ d.subject = 'Website Query'
+ d.status = 'Open'
+ d.owner = 'Guest'
+ d.save(1)
+ webnotes.msgprint("Thank you for your query. We will respond as soon as we can.")
\ No newline at end of file
diff --git a/erpnext/website/page/contact/contact.txt b/erpnext/website/page/contact/contact.txt
new file mode 100644
index 00000000000..6051c6f2c95
--- /dev/null
+++ b/erpnext/website/page/contact/contact.txt
@@ -0,0 +1,42 @@
+# Page, contact
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-01-25 16:02:15',
+ 'docstatus': 0,
+ 'modified': '2012-01-25 16:02:15',
+ 'modified_by': 'Administrator',
+ 'owner': 'Administrator'
+ },
+
+ # These values are common for all Page
+ {
+ 'doctype': 'Page',
+ 'module': 'Website',
+ 'name': '__common__',
+ 'page_name': 'contact',
+ 'standard': 'Yes'
+ },
+
+ # These values are common for all Page Role
+ {
+ 'doctype': 'Page Role',
+ 'name': '__common__',
+ 'parent': 'contact',
+ 'parentfield': 'roles',
+ 'parenttype': 'Page',
+ 'role': 'Guest'
+ },
+
+ # Page, contact
+ {
+ 'doctype': 'Page',
+ 'name': 'contact'
+ },
+
+ # Page Role
+ {
+ 'doctype': 'Page Role'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/website/utils.py b/erpnext/website/utils.py
new file mode 100644
index 00000000000..e1802cb64ff
--- /dev/null
+++ b/erpnext/website/utils.py
@@ -0,0 +1,14 @@
+def make_template(doc, path, convert_fields = ['main_section', 'side_section']):
+ """make template"""
+ import os, jinja2, markdown2
+
+ # markdown
+ for f in convert_fields:
+ doc.fields[f + '_html'] = markdown2.markdown(doc.fields[f] or '', \
+ extras=["wiki-tables"])
+
+ # write template
+ with open(path, 'r') as f:
+ temp = jinja2.Template(f.read())
+
+ return temp.render(doc = doc.fields)
\ No newline at end of file
diff --git a/index.html b/index.html
index dacded50693..02a2e506eb8 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
ERPNext
-