Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

website updates and fix to sessions

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-19 10:14:59 +05:30
parent fff3eb4142
commit e109fa4fb8
21 changed files with 403 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/doctype/item_group/item_group.js
View File

@ -17,6 +17,9 @@
cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.cscript.set_root_readonly(doc); cur_frm.cscript.set_root_readonly(doc);
cur_frm.add_custom_button("Item Group Tree", function() {
wn.set_route("Sales Browser", "Item Group");
})
} }
cur_frm.cscript.set_root_readonly = function(doc) { cur_frm.cscript.set_root_readonly = function(doc) {

17
setup/doctype/item_group/item_group.py
View File

@ -25,3 +25,20 @@ class DocType(DocTypeNestedSet):
self.doc = doc self.doc = doc
self.doclist = doclist self.doclist = doclist
self.nsm_parent_field = 'parent_item_group'; self.nsm_parent_field = 'parent_item_group';
def on_update(self):
if self.doc.show_in_website:
# webpage updates
from website.utils import update_page_name
page_name = self.doc.name
if webnotes.conn.get_value("Website Settings", None,
"default_product_category")==self.doc.name:
page_name = "products"
update_page_name(self.doc, self.doc.name)
def prepare_template_args(self):
self.doc.sub_groups = webnotes.conn.sql("""select name, page_name
from `tabItem Group` where parent_item_group=%s
and ifnull(show_in_website,0)=1""", self.doc.name, as_dict=1)

90
setup/doctype/item_group/item_group.txt
View File

@ -4,7 +4,7 @@
"docstatus": 0, "docstatus": 0,
"creation": "2012-12-07 15:15:28", "creation": "2012-12-07 15:15:28",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-12-17 15:00:01" "modified": "2012-12-18 16:23:48"
}, },
{ {
"in_create": 1, "in_create": 1,
@ -12,11 +12,13 @@
"module": "Setup", "module": "Setup",
"autoname": "field:item_group_name", "autoname": "field:item_group_name",
"document_type": "Master", "document_type": "Master",
"description": "Item Classification", "allow_attach": 1,
"issingle": 0, "issingle": 0,
"name": "__common__", "name": "__common__",
"allow_rename": 1, "allow_rename": 1,
"doctype": "DocType" "description": "Item Classification",
"doctype": "DocType",
"max_attachments": 3
}, },
{ {
"name": "__common__", "name": "__common__",
@ -49,33 +51,6 @@
"search_index": 0, "search_index": 0,
"reqd": 1 "reqd": 1
}, },
{
"description": "Check this if you want to show in website",
"no_copy": 0,
"search_index": 0,
"doctype": "DocField",
"label": "Show in Website",
"fieldname": "show_in_website",
"fieldtype": "Check"
},
{
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Featured Items HTML",
"fieldname": "featured_items_html",
"fieldtype": "HTML",
"options": "<h4>Featured Items</h4>"
},
{
"description": "Items Featured on the Item Group Page",
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Featured Items",
"fieldname": "featured_items",
"fieldtype": "Table",
"hidden": 1,
"options": "Featured Item"
},
{ {
"doctype": "DocField", "doctype": "DocField",
"label": "Page Name", "label": "Page Name",
@ -112,6 +87,45 @@
"reqd": 1, "reqd": 1,
"options": "\nYes\nNo" "options": "\nYes\nNo"
}, },
{
"doctype": "DocField",
"label": "Website Settings",
"fieldname": "sb9",
"fieldtype": "Section Break"
},
{
"description": "Check this if you want to show in website",
"no_copy": 0,
"search_index": 0,
"doctype": "DocField",
"label": "Show in Website",
"fieldname": "show_in_website",
"fieldtype": "Check"
},
{
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Description",
"fieldname": "description",
"fieldtype": "Text Editor"
},
{
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Featured Items",
"fieldname": "featured_items_html",
"fieldtype": "Section Break"
},
{
"description": "Items Featured on the Item Group Page",
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Featured Items",
"fieldname": "featured_items",
"fieldtype": "Table",
"hidden": 0,
"options": "Featured Item"
},
{ {
"print_hide": 1, "print_hide": 1,
"no_copy": 1, "no_copy": 1,
@ -154,6 +168,22 @@
"options": "Item Group", "options": "Item Group",
"report_hide": 1 "report_hide": 1
}, },
{
"doctype": "DocField",
"label": "file_list",
"fieldname": "file_list",
"fieldtype": "Text",
"hidden": 1
},
{
"print_hide": 1,
"no_copy": 1,
"doctype": "DocField",
"label": "File List",
"fieldname": "file_list",
"fieldtype": "Text",
"hidden": 1
},
{ {
"amend": 0, "amend": 0,
"create": 0, "create": 0,

2
support/doctype/support_ticket/support_ticket_list.js
View File

@ -15,7 +15,7 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
label_style: { label_style: {
"status": { "status": {
"Open": "danger", "Open": "important",
"Closed": "success", "Closed": "success",
"Hold": "info", "Hold": "info",
"Waiting for Customer": "info" "Waiting for Customer": "info"

369
website/doctype/website_settings/website_settings.txt
View File

@ -1,256 +1,217 @@
# DocType, Website Settings
[ [
# These values are common in all dictionaries
{ {
'creation': '2012-05-21 15:54:09', "owner": "Administrator",
'docstatus': 0, "docstatus": 0,
'modified': '2012-07-09 16:20:58', "creation": "2012-07-12 23:29:36",
'modified_by': u'Administrator', "modified_by": "Administrator",
'owner': u'Administrator' "modified": "2012-12-18 16:15:43"
}, },
# These values are common for all DocType
{ {
'_last_update': u'1329115882', "issingle": 1,
'allow_attach': 1, "allow_attach": 1,
'colour': u'White:FFF', "doctype": "DocType",
'doctype': 'DocType', "module": "Website",
'document_type': u'Other', "max_attachments": 10,
'issingle': 1, "document_type": "Other",
'max_attachments': 10, "name": "__common__"
'module': u'Website',
'name': '__common__',
'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
}, },
# These values are common for all DocField
{ {
'doctype': u'DocField', "name": "__common__",
'name': '__common__', "parent": "Website Settings",
'parent': u'Website Settings', "doctype": "DocField",
'parentfield': u'fields', "parenttype": "DocType",
'parenttype': u'DocType' "parentfield": "fields"
}, },
# These values are common for all DocPerm
{ {
'doctype': u'DocPerm', "name": "__common__",
'name': '__common__', "parent": "Website Settings",
'parent': u'Website Settings', "read": 1,
'parentfield': u'permissions', "doctype": "DocPerm",
'parenttype': u'DocType', "parenttype": "DocType",
'read': 1 "parentfield": "permissions"
}, },
# DocType, Website Settings
{ {
'doctype': 'DocType', "name": "Website Settings",
'name': u'Website Settings' "doctype": "DocType"
}, },
# DocPerm
{ {
'create': 1, "doctype": "DocField",
'doctype': u'DocPerm', "label": "Landing Page",
'permlevel': 0, "fieldname": "sb0",
'role': u'System Manager', "fieldtype": "Section Break",
'write': 1 "permlevel": 0
}, },
# DocPerm
{ {
'create': 1, "description": "The \"Web Page\" that is the website home page",
'doctype': u'DocPerm', "doctype": "DocField",
'permlevel': 0, "label": "Home Page",
'role': u'Website Manager', "options": "Web Page",
'write': 1 "fieldname": "home_page",
"fieldtype": "Link",
"reqd": 1,
"permlevel": 0
}, },
# DocPerm
{ {
'doctype': u'DocPerm', "description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.",
'permlevel': 1, "doctype": "DocField",
'role': u'All' "label": "Title Prefix",
"fieldname": "title_prefix",
"fieldtype": "Data",
"permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'top_bar', "fieldname": "cb4",
'fieldtype': u'Section Break', "fieldtype": "Column Break",
'label': u'Top Bar', "permlevel": 0
'permlevel': 0
}, },
# DocField
{ {
'colour': u'White:FFF', "description": "Only Items / Groups under this Groups will be shown on the website. This will also represent the \"Products\" Home Page.",
'description': u'The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.', "doctype": "DocField",
'doctype': u'DocField', "label": "Default Product Category",
'fieldname': u'title_prefix', "options": "Item Group",
'fieldtype': u'Data', "fieldname": "default_product_category",
'label': u'Title Prefix', "fieldtype": "Link",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'colour': u'White:FFF', "description": "If checked, the Home page will be the default Item Group for the website.",
'description': u'The "Web Page" that is the website home page', "doctype": "DocField",
'doctype': u'DocField', "label": "Home Page is Products",
'fieldname': u'home_page', "fieldname": "home_page_is_products",
'fieldtype': u'Link', "fieldtype": "Check",
'label': u'Home Page', "permlevel": 0
'options': u'Web Page',
'permlevel': 0,
'reqd': 1
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'default_product_category', "label": "Top Bar",
'fieldtype': u'Link', "fieldname": "top_bar",
'label': u'Default Product Category', "fieldtype": "Section Break",
'options': u'Item Group', "permlevel": 0
'permlevel': 0
}, },
# DocField
{ {
'colour': u'White:FFF', "description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px",
'description': u'Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag', "doctype": "DocField",
'doctype': u'DocField', "label": "Brand HTML",
'fieldname': u'brand_html', "fieldname": "brand_html",
'fieldtype': u'Text', "fieldtype": "Text",
'label': u'Brand HTML', "permlevel": 0
'permlevel': 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'top_bar_items', "label": "Top Bar Items",
'fieldtype': u'Table', "options": "Top Bar Item",
'label': u'Top Bar Items', "fieldname": "top_bar_items",
'options': u'Top Bar Item', "fieldtype": "Table",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'footer', "label": "Footer",
'fieldtype': u'Section Break', "fieldname": "footer",
'label': u'Footer', "fieldtype": "Section Break",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'address', "label": "Address",
'fieldtype': u'Text', "fieldname": "address",
'label': u'Address', "fieldtype": "Text",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'copyright', "label": "Copyright",
'fieldtype': u'Data', "fieldname": "copyright",
'label': u'Copyright', "fieldtype": "Data",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'footer_items', "label": "Footer Items",
'fieldtype': u'Table', "options": "Top Bar Item",
'label': u'Footer Items', "fieldname": "footer_items",
'options': u'Top Bar Item', "fieldtype": "Table",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'misc_section', "label": "Misc",
'fieldtype': u'Section Break', "fieldname": "misc_section",
'label': u'Misc', "fieldtype": "Section Break",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'colour': u'White:FFF', "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]",
'description': u'An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href="http://favicon-generator.org/" target="_blank">favicon-generator.org</a>]', "doctype": "DocField",
'doctype': u'DocField', "label": "FavIcon",
'fieldname': u'favicon', "options": "attach_files:",
'fieldtype': u'Select', "fieldname": "favicon",
'label': u'FavIcon', "fieldtype": "Select",
'options': u'attach_files:', "permlevel": 0
'permlevel': 0
}, },
# DocField
{ {
'description': u'Sub-domain provided by erpnext.com', "description": "Sub-domain provided by erpnext.com",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'subdomain', "label": "Subdomain",
'fieldtype': u'Text', "fieldname": "subdomain",
'label': u'Subdomain', "fieldtype": "Text",
'permlevel': 1, "reqd": 0,
'reqd': 0 "permlevel": 1
}, },
# DocField
{ {
'description': u'Enter domain names associated to this website, each on a new line', "description": "Enter domain names associated to this website, each on a new line",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'domain_list', "label": "Domain List",
'fieldtype': u'Text', "fieldname": "domain_list",
'hidden': 1, "fieldtype": "Text",
'label': u'Domain List', "reqd": 0,
'permlevel': 0, "hidden": 1,
'reqd': 0 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "print_hide": 1,
'fieldname': u'file_list', "no_copy": 1,
'fieldtype': u'Text', "doctype": "DocField",
'hidden': 1, "label": "File List",
'label': u'File List', "fieldname": "file_list",
'no_copy': 1, "fieldtype": "Text",
'permlevel': 0, "hidden": 1,
'print_hide': 1 "permlevel": 0
}, },
# DocField
{ {
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'analytics', "label": "Startup",
'fieldtype': u'Section Break', "fieldname": "analytics",
'label': u'Startup', "fieldtype": "Section Break",
'permlevel': 0 "permlevel": 0
}, },
# DocField
{ {
'colour': u'White:FFF', "description": "Bind events on startup and page change",
'description': u'Bind events on startup and page change', "doctype": "DocField",
'doctype': u'DocField', "label": "Startup Code",
'fieldname': u'startup_code', "options": "Javascript",
'fieldtype': u'Code', "fieldname": "startup_code",
'label': u'Startup Code', "fieldtype": "Code",
'options': u'Javascript', "permlevel": 0
'permlevel': 0 },
{
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "System Manager",
"permlevel": 0
},
{
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "Website Manager",
"permlevel": 0
},
{
"doctype": "DocPerm",
"role": "All",
"permlevel": 1
} }
] ]

3
website/helpers/product.py
View File

@ -29,6 +29,7 @@ def get_product_list(args=None):
from webnotes.utils import cstr from webnotes.utils import cstr
if not args: args = webnotes.form_dict if not args: args = webnotes.form_dict
if not args.search: args.search = ""
# base query # base query
query = """\ query = """\
@ -40,7 +41,7 @@ def get_product_list(args=None):
and show_in_website = 1 """ and show_in_website = 1 """
# search term condition # search term condition
if args.get('search'): if args.search:
query += """ query += """
and ( and (
web_short_description like %(search)s or web_short_description like %(search)s or

11
website/templates/css/products.css
View File

@ -1,11 +0,0 @@
<style>
.img-area {
float:left;
width: 115px;
}
.product-list-description {
float:left;
width: 400px;
}
</style>

2
website/templates/html/outer.html
View File

@ -9,7 +9,7 @@
</header> </header>
<div id="body_div"> <div id="body_div">
<div class="navbar-wrapper"> <div class="navbar-wrapper">
<div class="navbar navbar-inverse" <div class="navbar"
style="margin-bottom: 0px;"> style="margin-bottom: 0px;">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">

34
website/templates/html/product_group.html
View File

@ -1 +1,35 @@
{% extends "html/page.html" %} {% extends "html/page.html" %}
{% block content %}
<div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="content-product_group">
<div class="layout-main" style="padding: 30px;">
{% include 'html/product_search_box.html' %}
{% if description %}
<div>{{ description or ""}}</div>
{% else %}
<h3>{{ name }}</h3>
{% endif %}
{% if sub_groups %}
<div class="well">
<div class="container-fluid">
{% for d in sub_groups %}
<div class="span2">
<i class="icon-chevron-right"></i>
<a href="{{ d.page_name }}">{{ d.name }}</a></div>
{% endfor %}
</div>
</div>
{% endif %}
{% if obj.doclist.get({"doctype":"Featured Item"}) %}
<hr>
<h3>Featured Products</h3>
{% endif %}
</div>
</div>
</div>
{% endblock %}

6
website/templates/html/product_page.html
View File

@ -22,6 +22,7 @@
<div class="layout-main" style="padding: 30px;"> <div class="layout-main" style="padding: 30px;">
{% include 'html/product_search_box.html' %} {% include 'html/product_search_box.html' %}
<h1>{{ item_name }}</h1> <h1>{{ item_name }}</h1>
<p class="help">Item Code: {{ name }}</p>
<div class="product-page-content"> <div class="product-page-content">
<div class="span6"> <div class="span6">
{% if website_image %} {% if website_image %}
@ -29,7 +30,7 @@
{% else %} {% else %}
<div class="img-area"> <div class="img-area">
<div style='background-color: #eee; padding: 40px; <div style='background-color: #eee; padding: 40px;
width: 32px; font-size: 32px; color: #888;'> width: 32px; font-size: 32px; color: #888;' title='No Image'>
<i class='icon-camera'></i></div> <i class='icon-camera'></i></div>
</div> </div>
@ -46,7 +47,8 @@
<div class="span9"> <div class="span9">
<h3>Product Description</h3> <h3>Product Description</h3>
<div> <div>
{{ web_long_description or web_short_description }} {{ web_long_description or web_short_description or
"[No description given]" }}
</div> </div>
<hr> <hr>
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %} {% if obj.doclist.get({"doctype":"Item Website Specification"}) %}

6
website/templates/html/product_search_box.html
View File

@ -1,7 +1,8 @@
<div class="pull-right"> <div class="pull-right" style="margin-top:-15px;">
<form class="form-search"> <form class="form-search">
<div class="input-append"> <div class="input-append">
<input type="text" class="span2 search-query" id="product-search"> <input type="text" class="span2 search-query"
id="product-search" placeholder="Product Search...">
<button class="btn" id="btn-product-search"> <button class="btn" id="btn-product-search">
<i class="icon-search"></i></button> <i class="icon-search"></i></button>
</div> </div>
@ -22,3 +23,4 @@
}) })
</script> </script>
</div> </div>
<div class="clearfix"></div>

9
website/templates/js/blog.js
View File

@ -59,10 +59,17 @@ var blog = {
<p><a href="%(page_name)s">Read with comments...</a></p>\ <p><a href="%(page_name)s">Read with comments...</a></p>\
<hr /><br />', b)).appendTo($wrap); <hr /><br />', b)).appendTo($wrap);
}); });
blog.start += data.length; blog.start += (data.length || 0);
if(!data.length) { if(!data.length) {
if(blog.start) {
$("#next-page").toggle(false) $("#next-page").toggle(false)
.parent().append("<div class='alert'>Nothing more to show.</div>"); .parent().append("<div class='alert'>Nothing more to show.</div>");
} else {
$("#next-page").toggle(false)
.parent().append("<div class='alert'>No blogs written yet.</div>");
}
} else {
$("#next-page").toggle(true);
} }
} }
} }

33
website/templates/js/blog_subscribe.js
View File

@ -1,33 +0,0 @@
wn.provide('erpnext.blog');
(function() {
$('body').on('click', '.btn-blog-subscribe', function() {
var d = new wn.ui.Dialog({
title: "Get Blog Updates via Email",
fields: [
{label: "Your Name", fieldtype:"Data", reqd:1},
{label: "Your Email Address", fieldtype:"Data", reqd:1
,description: "You can unsubscribe anytime."},
{label: "Subscribe", fieldtype:"Button"}
]
});
$(d.fields_dict.subscribe.input).click(function() {
var args = d.get_values();
if(!args) return;
wn.call({
method: 'website.helpers.blog.add_subscriber',
args: args,
callback: function(r) {
if(r.exc) {
msgprint('Opps there seems to be some error, Please check back after some time.');
} else {
msgprint('Thanks for subscribing!');
}
d.hide();
},
btn: this
})
})
d.show()
})
})()

18
website/templates/js/product_category.js
View File

@ -1,18 +0,0 @@
wn.provide('erpnext.products');
erpnext.products.make_product_categories = function(wrapper) {
if (!wrapper) { wrapper = erpnext.products.wrapper; }
if (!wrapper) { return; }
wrapper.category_list = new wn.ui.Listing({
parent: $(wrapper).find('.more-categories').get(0),
method: 'website.helpers.product.get_product_category_list',
hide_refresh: true,
render_row: function(parent, data) {
parent.innerHTML = repl(
'<a href="products.html#!products/%(item_group)s">%(item_group)s</a> (%(items)s)',
data);
}
});
wrapper.category_list.run();
}

106
website/templates/js/products.js
View File

@ -1,106 +0,0 @@
// ERPNext - web based ERP (http://erpnext.com)
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// js inside blog page
{% include "js/product_category.js" %}
wn.pages['{{ name }}'].onload = function(wrapper) {
erpnext.products.wrapper = wrapper;
// make product categories in the sidebar
erpnext.products.make_product_categories(wrapper);
// make lists
erpnext.products.make_product_list(wrapper);
// bind search button or enter key
$(wrapper).find('.products-search .btn').click(function() {
erpnext.products.product_list.run();
});
$(wrapper).find('.products-search input').keypress(function(ev) {
if(ev.which==13) $(wrapper).find('.products-search .btn').click();
});
}
erpnext.products.make_product_list = function(wrapper) {
if (!wrapper) { wrapper = erpnext.products.wrapper; }
if (!wrapper) { return; }
erpnext.products.product_list = new wn.ui.Listing({
parent: $(wrapper).find('#products-list').get(0),
run_btn: $(wrapper).find('.products-search .btn').get(0),
no_toolbar: true,
method: 'website.helpers.product.get_product_list',
get_args: function() {
return {
search: $('input[name="products-search"]').val() || '',
product_group: erpnext.products.cur_group || '',
};
},
render_row: function(parent, data) {
if (!data.web_short_description) {
data.web_short_description = data.description;
}
parent.innerHTML = repl('\
<a href="%(page_name)s.html"><div class="img-area"></div></a>\
<div class="product-list-description">\
<h4><a href="%(page_name)s.html">%(item_name)s</a></h4>\
<p>%(web_short_description)s</p></div>\
<div style="clear: both;"></div>', data);
if(data.website_image) {
$(parent).find('.img-area').append(repl(
'<img src="files/%(website_image)s" style="width:100px;">', data))
} else {
$(parent).find('.img-area').append(wn.dom.placeholder(100,
data.item_name));
}
}
});
}
wn.pages['{{ name }}'].onshow = function(wrapper) {
// show default product category
erpnext.products.set_group();
}
erpnext.products.set_group = function() {
var cat = erpnext.products.get_group();
// get erpnext.products.default_category
var wrapper = erpnext.products.wrapper;
$(wrapper).find('h1').html(cat.label);
erpnext.products.product_list.run();
}
erpnext.products.get_group = function() {
route = wn.get_route();
if(route && route.length>1) {
// from url
var grp = route[1];
var label = route[1];
erpnext.products.cur_group = grp;
} else {
// default
var grp = 'Products';
var label = 'Products';
erpnext.products.cur_group = null;
}
return {grp:grp, label:label};
}

2
website/templates/pages/404.html
View File

@ -3,7 +3,7 @@
{% block content %} {% block content %}
<div class="content"> <div class="content">
<div class="layout-wrapper layout-main"> <div class="layout-wrapper layout-main">
<h3>Page missing or moved</h3> <h3><i class="icon-exclamation-sign"></i> Page missing or moved</h3>
<br> <br>
<p>We are very sorry for this, but the page you are looking for is missing <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> (this could be because of a typo in the address) or moved.</p>

5
website/templates/pages/blog.html
View File

@ -17,11 +17,12 @@
<div class="layout-main"> <div class="layout-main">
<h1>Blog</h1> <h1>Blog</h1>
<br> <br>
<div id="blog-list" style="min-height: 400px;"> <div id="blog-list">
<!-- blog list will be generated dynamically --> <!-- blog list will be generated dynamically -->
</div> </div>
<div style="text-align: center;"> <div style="text-align: center;">
<button id="next-page" class="btn">More...</button> <button id="next-page" class="btn"
style="display:none;">More...</button>
</div> </div>
</div> </div>
</div> </div>

11
website/templates/pages/error.html Normal file
View File

@ -0,0 +1,11 @@
{% extends "html/outer.html" %}
{% 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 %}

13
website/templates/pages/product_search.html
View File

@ -56,7 +56,13 @@ $(document).ready(function() {
} }
if(data.length < 10) { if(data.length < 10) {
$(".more-btn").replaceWith("<div class='alert'>Nothing more to show</div>"); if(!table) {
$(".more-btn")
.replaceWith("<div class='alert'>No results found for your search.</div>");
} else {
$(".more-btn")
.replaceWith("<div class='alert'>Nothing more to show.</div>");
}
} else { } else {
$(".more-btn").toggle(true) $(".more-btn").toggle(true)
} }
@ -78,11 +84,14 @@ $(document).ready(function() {
<div id="search-list"> <div id="search-list">
</div> </div>
<div class="more-btn" style="text-align: middle; display: none;"> <div style="text-align: center;">
<div class="more-btn"
style="display: none; text-align: center;">
<button class="btn">More...</button> <button class="btn">More...</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

37
website/templates/pages/products.html
View File

@ -1,37 +0,0 @@
{% extends "html/page.html" %}
{% block javascript %}
{% include "js/products.js" %}
{% endblock %}
{% block css %}
{% include "css/products.css" %}
{% endblock %}
{% block title %}
Products
{% endblock %}
{% block content %}
<div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="content-products">
<div class="layout-main-section">
<h1 class="products-category"></h1>
<div class="products-search" style="margin-bottom: 15px;">
<input name="products-search" />
<button class="btn" style="margin-left: 7px">Search</button>
</div>
<div id="products-list">
<!-- product list will be generated dynamically -->
</div>
</div>
<div class="layout-side-section">
<h3>Categories</h3>
<div class="more-categories"></div>
</div>
<div style="clear: both"></div>
</div>
</div>
{% endblock %}

35
website/utils.py
View File

@ -48,7 +48,7 @@ def render(page_name):
else: else:
html = get_html('index') html = get_html('index')
except Exception, e: except Exception, e:
html = get_html('404') html = get_html('error')
from webnotes.handler import eprint, print_zip from webnotes.handler import eprint, print_zip
eprint("Content-Type: text/html") eprint("Content-Type: text/html")
@ -57,33 +57,30 @@ def render(page_name):
def get_html(page_name): def get_html(page_name):
"""get page html""" """get page html"""
page_name = scrub_page_name(page_name) page_name = scrub_page_name(page_name)
comments = get_comments(page_name)
html = '' html = ''
# load from cache, if auto cache clear is falsy # load from cache, if auto cache clear is falsy
if not (hasattr(conf, 'auto_cache_clear') and conf.auto_cache_clear or 0): if not (hasattr(conf, 'auto_cache_clear') and conf.auto_cache_clear or 0):
html = webnotes.cache().get_value("page:" + page_name) html = webnotes.cache().get_value("page:" + page_name)
from_cache = True
if html: if not html:
comments += "\nload status: cache"
else:
html = load_into_cache(page_name) html = load_into_cache(page_name)
comments += "\nload status: fresh" from_cache = False
# insert comments if not html:
html = get_html("404")
if page_name=="error":
html = html % {"error": webnotes.getTraceback()}
else:
comments = "\n\npage:"+page_name+\
"\nload status: " + (from_cache and "cache" or "fresh")
html += """\n<!-- %s -->""" % webnotes.utils.cstr(comments) html += """\n<!-- %s -->""" % webnotes.utils.cstr(comments)
return html return html
def get_comments(page_name):
if page_name == '404':
comments = """error: %s""" % webnotes.getTraceback()
else:
comments = """page: %s""" % page_name
return comments
def scrub_page_name(page_name): def scrub_page_name(page_name):
if page_name.endswith('.html'): if page_name.endswith('.html'):
page_name = page_name[:-5] page_name = page_name[:-5]
@ -114,6 +111,8 @@ def update_page_name(doc, title):
def load_into_cache(page_name): def load_into_cache(page_name):
args = prepare_args(page_name) args = prepare_args(page_name)
if not args:
return ""
html = build_html(args) html = build_html(args)
webnotes.cache().set_value("page:" + page_name, html) webnotes.cache().set_value("page:" + page_name, html)
return html return html
@ -141,6 +140,9 @@ def prepare_args(page_name):
else: else:
args = get_doc_fields(page_name) args = get_doc_fields(page_name)
if not args:
return False
args.update(get_outer_env()) args.update(get_outer_env())
return args return args
@ -156,6 +158,9 @@ def get_template_pages():
def get_doc_fields(page_name): def get_doc_fields(page_name):
doc_type, doc_name = get_source_doc(page_name) doc_type, doc_name = get_source_doc(page_name)
if not doc_type:
return False
obj = webnotes.get_obj(doc_type, doc_name, with_children=True) obj = webnotes.get_obj(doc_type, doc_name, with_children=True)
if hasattr(obj, 'prepare_template_args'): if hasattr(obj, 'prepare_template_args'):