Merge branch 'master' of github.com:webnotes/erpnext

home/page/attributions/attributions.html

@@ -59,7 +59,7 @@
 	<h4>Icons</h4>
 	<ul>
 		<li>The Noun Project</li>
-		<li>Glyphicons</li>
+		<li>Font Awesome: http://fortawesome.github.com/Font-Awesome</li>
 	</ul>
 
 	<h4>Web Frameworks</h4>

home/page/latest_updates/latest_updates.js

@@ -1,4 +1,7 @@
 erpnext.updates = [
+	["14th December 2012", [
+		"Website Module: Major Refactor - removed framework code from website."
+	]],
 	["12th December 2012", [
 		"Attachments: Attachments can be set as URLs or File Uploads. This will help if people want to share documents from Google Docs, Dropbox and other such services (esp for the Product listings on websites).",
 		"Global Defaults: Session Expiry can now be set in Global Defaults.",

patches/december_2012/clear_web_cache.py

@@ -0,0 +1,8 @@
+import webnotes
+def execute():
+	# build wn-web.js and wn-web.css
+	from website.helpers.make_web_include_files import make
+	make()
+
+	import website.utils
+	website.utils.clear_cache()

patches/patch_list.py

@@ -741,4 +741,8 @@ patch_list = [
 		'patch_module': 'patches.december_2012',
 		'patch_file': 'replace_createlocal',
 	},
+	{
+		'patch_module': 'patches.december_2012',
+		'patch_file': 'clear_web_cache',
+	},
 ]

public/build.json

@@ -7,10 +7,11 @@
 		"app/public/js/startup.css"
 	],
 	"public/js/all-web.js": [
-		"app/public/js/startup.js",
+		"app/public/js/website_utils.js"
-		"app/public/js/conf.js"
 	],
 	"public/js/all-app.js": [
+		"app/public/js/startup.js",
+		"app/public/js/conf.js",
 		"app/public/js/modules.js",
 		"app/public/js/toolbar.js",
 		"app/public/js/feature_setup.js",

public/js/startup.js

@@ -136,23 +136,6 @@ erpnext.startup.set_periodic_updates = function() {
 	wn.updates.id = setInterval(erpnext.update_messages, 60000);
 }
 
-// subject, sender, description
-erpnext.send_message = function(opts) {
-	if(opts.btn) {
-		$(opts.btn).start_working();
-	}
-	wn.call({
-		method: 'website.send_message',
-		args: opts,
-		callback: function(r) { 
-			if(opts.btn) {
-				$(opts.btn).done_working();
-			}
-			if(opts.callback)opts.callback(r) 
-		}
-	});
-}
-
 erpnext.hide_naming_series = function() {
 	if(cur_frm.fields_dict.naming_series) {
 		hide_field('naming_series');

public/js/website_utils.js

@@ -0,0 +1,53 @@
+
+var erpnext = {};
+
+// subject, sender, description
+erpnext.send_message = function(opts) {
+	if(opts.btn) {
+		$(opts.btn).attr("disabled", "disabled");
+	}
+		
+	$.ajax({
+		method: "POST",
+		url: "server.py",
+		data: {
+			cmd: "website.send_message",
+			subject: opts.subject,
+			sender: opts.sender,
+			message: typeof opts.message == "string"
+				? opts.message
+				: JSON.stringify(opts.message)
+		},
+		dataType: "json",
+		success: function(data) {
+			if(opts.btn) {
+				$(opts.btn).attr("disabled", false);
+			}
+			if(opts.callback) 
+				opts.callback(data);
+		}
+	});
+}
+
+function valid_email(id) { 
+	if(id.toLowerCase().search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1) 
+		return 0; else return 1; }
+
+function get_url_arg(name) {
+	name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
+	var regexS = "[\\?&]"+name+"=([^&#]*)";
+	var regex = new RegExp( regexS );
+	var results = regex.exec( window.location.href );
+	if(results == null)
+		return "";
+	else
+		return decodeURIComponent(results[1]);		
+}
+
+function repl(s, dict) {
+	if(s==null)return '';
+	for(key in dict) {
+		s = s.split("%("+key+")s").join(dict[key]);
+	}
+	return s;
+}

setup/doctype/item_group/item_group.txt

@@ -2,9 +2,9 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-12-06 15:57:00", 
+  "creation": "2012-12-07 15:15:28", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-07 14:55:49"
+  "modified": "2012-12-17 15:00:01"
  }, 
  {
   "in_create": 1, 
@@ -53,7 +53,6 @@
   "description": "Check this if you want to show in website", 
   "no_copy": 0, 
   "search_index": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Show in Website", 
   "fieldname": "show_in_website", 
@@ -70,13 +69,19 @@
  {
   "description": "Items Featured on the Item Group Page", 
   "depends_on": "show_in_website", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Featured Items", 
   "fieldname": "featured_items", 
   "fieldtype": "Table", 
+  "hidden": 1, 
   "options": "Featured Item"
  }, 
+ {
+  "doctype": "DocField", 
+  "label": "Page Name", 
+  "fieldname": "page_name", 
+  "fieldtype": "Data"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
@@ -88,7 +93,6 @@
   "doctype": "DocField", 
   "label": "Parent Item Group", 
   "oldfieldname": "parent_item_group", 
-  "trigger": "Client", 
   "fieldname": "parent_item_group", 
   "fieldtype": "Link", 
   "search_index": 0, 
@@ -99,7 +103,6 @@
   "description": "Only leaf nodes are allowed in transaction", 
   "no_copy": 0, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Has Child Node", 
   "oldfieldname": "is_group", 
@@ -151,6 +154,46 @@
   "options": "Item Group", 
   "report_hide": 1
  }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 0
+ }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
@@ -166,45 +209,5 @@
   "role": "Material Master Manager", 
   "cancel": 1, 
   "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
  }
 ]

stock/doctype/featured_item/featured_item.py

@@ -0,0 +1,22 @@
+# 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/>.
+
+from __future__ import unicode_literals
+import webnotes
+
+class DocType:
+	def __init__(self, d, dl):
+		self.doc, self.doclist = d, dl

stock/doctype/item/item.js

@@ -138,4 +138,15 @@ cur_frm.fields_dict.item_customer_details.grid.get_field("customer_name").get_qu
 	erpnext.utils.customer_query;
 	
 cur_frm.fields_dict.item_supplier_details.grid.get_field("supplier").get_query = 
-	erpnext.utils.supplier_query;
+	erpnext.utils.supplier_query;
+
+cur_frm.cscript.on_remove_attachment = function(doc) {
+	// refresh image list before unsetting image
+	refresh_field("image");
+	if(!inList(cur_frm.fields_dict.image.df.options.split("\n"), doc.image)) {
+		// if the selected image is removed from attachment, unset it
+		cur_frm.set_value("image", "");
+		msgprint(wn._("Attachment removed. You may need to update: ") 
+			+ wn.meta.get_docfield(doc.doctype, "description_html").label);
+	}
+};

stock/doctype/item/item.txt

@@ -2,9 +2,9 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-12-11 15:58:47", 
+  "creation": "2012-12-17 14:56:32", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-11 16:08:49"
+  "modified": "2012-12-17 16:02:00"
  }, 
  {
   "allow_attach": 1, 
@@ -459,6 +459,7 @@
   "permlevel": 0
  }, 
  {
+  "no_copy": 1, 
   "oldfieldtype": "Table", 
   "doctype": "DocField", 
   "label": "UOM Conversion Details", 
@@ -779,6 +780,48 @@
   "fieldtype": "Select", 
   "permlevel": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb72", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Show Price in Website (if set)", 
+  "depends_on": "show_in_website", 
+  "doctype": "DocField", 
+  "label": "Website Price List", 
+  "options": "Price List", 
+  "fieldname": "website_price_list", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
+  "depends_on": "show_in_website", 
+  "doctype": "DocField", 
+  "label": "Website Warehouse", 
+  "options": "Warehouse", 
+  "fieldname": "website_warehouse", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "depends_on": "show_in_website", 
+  "doctype": "DocField", 
+  "fieldname": "sb72", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "depends_on": "show_in_website", 
+  "doctype": "DocField", 
+  "label": "Item Website Specifications", 
+  "options": "Item Website Specification", 
+  "fieldname": "item_website_specifications", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
  {
   "depends_on": "show_in_website", 
   "doctype": "DocField", 
@@ -791,7 +834,6 @@
   "depends_on": "show_in_website", 
   "doctype": "DocField", 
   "label": "Long Description", 
-  "options": "Markdown", 
   "fieldname": "web_long_description", 
   "fieldtype": "Text Editor", 
   "permlevel": 0

stock/doctype/item_website_specification/item_website_specification.py

@@ -0,0 +1,8 @@
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import webnotes
+
+class DocType:
+	def __init__(self, d, dl):
+		self.doc, self.doclist = d, dl

stock/doctype/item_website_specification/item_website_specification.txt

@@ -4,7 +4,7 @@
   "docstatus": 0, 
   "creation": "2012-12-07 15:42:25", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-07 15:44:18"
+  "modified": "2012-12-17 15:29:37"
  }, 
  {
   "istable": 1, 

website/__init__.py

@@ -6,6 +6,8 @@ install_docs = [
 
 import webnotes
 
+max_tickets_per_hour = 200
+
 @webnotes.whitelist(allow_guest=True)
 def send_message():
 	from webnotes.model.doc import Document
@@ -17,15 +19,21 @@ def send_message():
 	d.raised_by = webnotes.form_dict.get('sender')
 	
 	if not d.description:
-		webnotes.msgprint('Please write something', raise_exception=True)
+		webnotes.response["message"] = 'Please write something'
+		return
 		
 	if not d.raised_by:
-		webnotes.msgprint('Please give us your email id so that we can write back to you', raise_exception=True)
+		webnotes.response["message"] = 'Email Id Required'
+		return
 	
-	# make lead or contact
+	# guest method, cap max writes per hour
+	if webnotes.conn.sql("""select count(*) from `tabSupport Ticket`
+		where TIMEDIFF(NOW(), modified) < '01:00:00'""")[0][0] > max_tickets_per_hour:
+		webnotes.response["message"] = "Sorry: we believe we have received an unreasonably high number of requests of this kind. Please try later"
+		return
 	
 	d.save()
-	webnotes.msgprint('Thank you!')
+	webnotes.response["message"] = 'Thank You'
 	
 def get_site_address():
 	from webnotes.utils import get_request_site_address

website/helpers/blog.py

@@ -9,8 +9,7 @@ import website.utils
 def get_blog_list(args=None):
 	"""
 		args = {
-			'limit_start': 0,
+			'start': 0,
-			'limit_page_length': 10,
 		}
 	"""
 	import webnotes
@@ -24,11 +23,9 @@ def get_blog_list(args=None):
 				comment_doctype='Blog' and comment_docname=`tabBlog`.name) as comments
 		from `tabBlog`
 		where ifnull(published,0)=1
-		order by creation desc, name asc"""
+		order by creation desc, name asc
-	
+		limit %s, 5""" % args.start
-	from webnotes.widgets.query_builder import add_limit_to_query
+		
-	query, args = add_limit_to_query(query, args)
-	
 	result = webnotes.conn.sql(query, args, as_dict=1)
 
 	# strip html tags from content
@@ -41,38 +38,6 @@ def get_blog_list(args=None):
 		if not res['content']:
 			res['content'] = website.utils.get_html(res['page_name'])
 		res['content'] = split_blog_content(res['content'])
-		res['content'] = res['content'][:1000]
-
-	return result
-
-@webnotes.whitelist(allow_guest=True)
-def get_recent_blog_list(args=None):
-	"""
-		args = {
-			'limit_start': 0,
-			'limit_page_length': 5,
-			'name': '',
-		}
-	"""
-	import webnotes
-	
-	if not args: args = webnotes.form_dict
-	
-	query = """\
-		select name, page_name, title, left(content, 100) as content
-		from tabBlog
-		where ifnull(published,0)=1 and
-		name!=%(name)s order by creation desc"""
-	
-	from webnotes.widgets.query_builder import add_limit_to_query
-	query, args = add_limit_to_query(query, args)
-	
-	result = webnotes.conn.sql(query, args, as_dict=1)
-
-	# strip html tags from content
-	import webnotes.utils
-	for res in result:
-		res['content'] = webnotes.utils.strip_html(res['content'])
 
 	return result
 

website/templates/css/blog_page.css

@@ -6,4 +6,8 @@
 		.comment-content {
 			margin-left: 20px;
 		}
+		
+		input {
+			width: 240px;
+		}
 	</style>

website/templates/css/login.css

@@ -5,6 +5,7 @@
 		}
 
 		.layout-wrapper {
+			background-color: #fff;
 			padding: 10px;
 			box-shadow: 1px 1px 3px 3px #ccc;
 			font-size: 12px;

website/templates/css/product_page.css

@@ -1,34 +1,9 @@
 	<style>
+		.item-main-image {
+			max-width: 60%;
+		}
 		.web-long-description {
 			font-size: 18px;
 			line-height: 200%;
 		}
-		.product-page-content {
-			float: left;
-		}
-		/* product page image css */
-		.product-page-content img {
-			max-width: 100%;
-		}
-		
-		/* similar products listing */
-		.similar-products .img-area img {
-			max-width: 55px;
-			max-height: 55px;
-		}
-		
-		.similar-products .img-area {
-			float: left;
-			width: 30%;
-			margin-top: 0.3em;
-		}
-		
-		.similar-product-description {
-			float: left;
-			width: 70%;
-		}
-		
-		.similar-product-description span {
-			font-size: 12px;
-		}
 	</style>

website/templates/html/blog_page.html

@@ -2,7 +2,6 @@
 
 {% block javascript %}
 	{% include "js/blog_page.js" %}
-	{% include "js/blog_subscribe.js" %}
 {% endblock %}
 
 {% block css %}
@@ -28,15 +27,32 @@
 				<div class="blog-comments">
 					
 					{% if not comment_list %}
-					<div class="no-result help hide">
+					<div class="alert no-comment">
 						<p>Be the first one to comment</p>
-						<br />
 					</div>
 					{% endif %}
 					
 					{% include 'html/comment.html' %}
 				</div>
-				<button class="btn add-comment">Add Comment</button>
+				<div><button class="btn add-comment">Add Comment</button></div>
+				<div style="display: none; margin-top: 10px;" 
+					id="comment-form" class="well">
+					<div class="alert" style="display:none;"></div>
+					<form>
+						<p>
+							<input name="comment_by_fullname" placeholder="Your Name" />
+						</p>
+						<p>
+							<input name="comment_by" placeholder="Your Email Id" />
+						</p>
+						<p>
+							<textarea name="comment" placeholder="Comment" />
+							</textarea>
+						</p>
+						<p>
+							<button class="btn btn-info" id="submit-comment">Submit</button>
+					</form>
+				</div>
 			</div>
 		</div>
 	</div>

website/templates/html/page.html

@@ -5,28 +5,12 @@
 {% block header %}
 	{{ super() }}
 	<script>
-	window.page_name = "{{ name }}";
+	{% block javascript %}
-
+	{% endblock %}
-	$(document).bind('app_ready', function() {
-		var _page = new wn.views.Page(window.page_name);
-	
-		// page script
-		{% block javascript %}
-		{% endblock %}
-	
-		// trigger onload
-		_page.trigger('onload');
-	
-		// activate page
-		wn.container.change_to(window.page_name);
-	});
 	</script>
-	
 	{% block css %}
-	{% if insert_style %}
+	{% if insert_style %}	
-	
 	<style>{{ css }}</style>
-
 	{% endif %}
 	{% endblock %}
 {% endblock %}

website/templates/html/product_group.html

@@ -0,0 +1 @@
+{% extends "html/page.html" %}

website/templates/html/product_page.html

@@ -19,30 +19,36 @@
 {% block content %}
 	<div class="layout-wrapper layout-wrapper-background">
 		<div class="web-content" id="content-product-{{ name }}">
-			<div class="layout-main-section">
+			<div class="layout-main" style="padding: 30px;">
 				<h1>{{ item_name }}</h1>
 				<div class="product-page-content">
 					<br><br>
 					{% if website_image %}
-					<image src="files/{{ website_image }}" />
+					<image class="item-main-image" src="files/{{ website_image }}" />
 					{% else %}
 					<div class="img-area"></div>
 					<span style="font-size: 11px">This is an auto-generated Image</span>
 					{% endif %}
 					<br><br>
-					<div class="web-long-description">
+					<h3>Product Description</h3>
-					{{ web_description_html }}
+					<div>
+					{{ web_long_description or web_short_description }}
 					</div>
+					<hr>
+					{% if obj.doclist.get({"doctype":"Item Website Specification"}) %}
+						<h3>Specifications</h3>
+						<table class="table table-striped table-bordered" style="width: 80%">
+						{% for d in obj.doclist.get(
+							{"doctype":"Item Website Specification"}) %}
+							<tr>
+								<td>{{ d.label }}</td>
+								<td>{{ d.description }}</td>
+							</tr>
+						{% endfor %}
+						</table>
+					{% endif %}
 				</div>
 			</div>
-			<div class="layout-side-section">
-				<h4>More Categories</h4>
-				<div class="more-categories"></div>
-				<br>
-				<h4>Similar Products</h4>
-				<div class="similar-products"></div>
-			</div>
-			<div style="clear: both"></div>
 		</div>
 	</div>
 {% endblock %}

website/templates/js/blog.js

@@ -15,29 +15,54 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // js inside blog page
-wn.pages['{{ name }}'].onload = function(wrapper) {
+
-	erpnext.blog_list = new wn.ui.Listing({
+$(document).ready(function() {
-		parent: $(wrapper).find('#blog-list').get(0),
+	// make list of blogs
-		method: 'website.helpers.blog.get_blog_list',
+	blog.get_list();
-		hide_refresh: true,
+	
-		no_toolbar: true,
+	$("#next-page").click(function() {
-		render_row: function(parent, data) {
+		blog.get_list();
-			if(!data.comments) {
+	})
-				data.comment_text = 'No comments yet.'
+});
-			} else if (data.comments===1) {
+
-				data.comment_text = '1 comment.'
+var blog = {
+	start: 0,
+	get_list: function() {
+		$.ajax({
+			method: "GET",
+			url: "server.py",
+			data: {
+				cmd: "website.helpers.blog.get_blog_list",
+				start: blog.start
+			},
+			dataType: "json",
+			success: function(data) {
+				blog.render(data.message);
+			}
+		});
+	},
+	render: function(data) {
+		var $wrap = $("#blog-list");
+		$.each(data, function(i, b) {
+			// comments
+			if(!b.comments) {
+				b.comment_text = 'No comments yet.'
+			} else if (b.comments===1) {
+				b.comment_text = '1 comment.'
 			} else {
-				data.comment_text = data.comments + ' comments.'
+				b.comment_text = b.comments + ' comments.'
 			} 
 			
-			if(data.content && data.content.length==1000) {
+			$(repl('<h2><a href="%(page_name)s.html">%(title)s</a></h2>\
-				data.content += repl('... <a href="%(page_name)s.html">(read on)</a>', data);
-			}
-			parent.innerHTML = repl('<h2><a href="%(page_name)s.html">%(title)s</a></h2>\
 				<div class="help">%(comment_text)s</div>\
-				%(content)s<br /><br />', data);
+				%(content)s<br />\
-		},
+				<p><a href="%(page_name)s">Read with comments...</a></p>\
-		page_length: 10
+				<hr /><br />', b)).appendTo($wrap);
-	});
+		});
-	erpnext.blog_list.run();
+		blog.start += data.length;
+		if(!data.length) {
+			$("#next-page").toggle(false)
+				.parent().append("<div class='alert'>Nothing more to show.</div>");
+		}
+	}
 }

website/templates/js/blog_page.js

@@ -16,166 +16,61 @@
 
 // js inside blog page
 
-wn.provide('erpnext.blog');
+$(document).ready(function() {
-wn.pages['{{ name }}'].onload = function(wrapper) {
+	var n_comments = $(".comment-row").length;
-	erpnext.blog.wrapper = wrapper;
 	
-	// sidebar
+	if(n_comments) {
-	//erpnext.blog.render_recent_list(wrapper);
+		$(".no_comment").toggle(false);
-	
-	// unhide no-result if no comments found
-	erpnext.blog.toggle_no_result(wrapper);
-	
-	// bind add comment button to comment dialog
-	erpnext.blog.make_comment_dialog(wrapper);
-	
-	// hide add comment button after 50 comments
-	erpnext.blog.toggle_add_comment_btn(wrapper);
-}
-
-erpnext.blog.adjust_page_height = function(wrapper) {
-	if (!wrapper) { wrapper = erpnext.blog.wrapper; }
-	if (!wrapper) { return; }
-
-	// adjust page height based on sidebar height
-	var $main_page = $(wrapper).find('.layout-main-section');
-	var $sidebar = $(wrapper).find('.layout-side-section');
-	if ($sidebar.height() > $main_page.height()) {
-		$main_page.height($sidebar.height());
 	}
-}
+	if(n_comments > 50) {
-
+		$(".add-comment").toggle(false)
-erpnext.blog.render_recent_list = function(wrapper) {
+			.parent().append("<div class='alert'>Comments are closed.</div>")
-	if (!wrapper) { wrapper = erpnext.blog.wrapper; }
-	if (!wrapper) { return; }
-	
-	wrapper.recent_list = new wn.ui.Listing({
-		parent: $(wrapper).find('.recent-posts'),
-		no_toolbar: true,
-		method: 'website.helpers.blog.get_recent_blog_list',
-		get_args: function() {
-			return { name: '{{ name }}' }
-		},
-		hide_refresh: true,
-		render_row: function(parent, data) {
-			if(data.content && data.content.length>=100) data.content += '...';
-			parent.innerHTML = repl('<div style="font-size: 80%">\
-				<a href="%(page_name)s.html">%(title)s</a>\
-				<div class="comment">%(content)s</div><br></div>', data);
-			
-			// adjust page height depending on sidebar height
-			erpnext.blog.adjust_page_height(wrapper);
-		},
-		page_length: 5,
-	});
-	wrapper.recent_list.run();
-}
-
-erpnext.blog.toggle_no_result = function(wrapper) {
-	if (!wrapper) { wrapper = erpnext.blog.wrapper; }
-	if (!wrapper) { return; }
-	
-	var $blog_comments = $(wrapper).find('.blog-comments');
-	var $comment_rows = $blog_comments.find('.comment-row');
-	var $no_result = $blog_comments.find('.no-result');
-
-	if ($comment_rows.length == 0) {
-		$no_result.removeClass('hide');
-	} else {
-		$no_result.addClass('hide');
 	}
-}
+	$(".add-comment").click(function() {
-
+		$("#comment-form").toggle();
-erpnext.blog.make_comment_dialog = function(wrapper) {
+		$("#comment-form input, #comment-form, textarea").val("");
-	if (!wrapper) { wrapper = erpnext.blog.wrapper; }
+	})
-	if (!wrapper) { return; }
+	$("#submit-comment").click(function() {
-	
+		var args = {
-	var $comment_btn = $(wrapper).find('button.add-comment');
+			comment_by_fullname: $("[name='comment_by_fullname']").val(),
-	
+			comment_by: $("[name='comment_by']").val(),
-	$comment_btn.click(function() {
+			comment: $("[name='comment']").val(),
-		if(!erpnext.blog.comment_dialog) {
+			cmd: "website.helpers.blog.add_comment",
-			var d = new wn.ui.Dialog({
+			comment_doctype: "Blog",
-				title: 'Add Comment',
+			comment_docname: "{{ name }}",
-				fields: [
+			page_name: "{{ page_name }}"
-					{
-						fieldname: 'comment_by_fullname', label: 'Your Name',
-						reqd: 1, fieldtype: 'Data'
-					},
-					{
-						fieldname: 'comment_by', label: 'Email Id',
-						reqd: 1, fieldtype: 'Data'
-					},
-					{
-						fieldname: 'comment', label: 'Comment',
-						reqd: 1, fieldtype: 'Text'
-					},
-					{
-						fieldname: 'post_comment', label: 'Post Comment',
-						fieldtype: 'Button'
-					},
-				],
-			});
-			
-			erpnext.blog.comment_dialog = d;
 		}
 		
-		erpnext.blog.comment_dialog.fields_dict.post_comment
+		$("#comment-form .alert").toggle(false);
-				.input.onclick = function() {
+		
-			erpnext.blog.add_comment(wrapper);
+		if(!args.comment_by_fullname || !args.comment_by || !args.comment) {
+			$("#comment-form .alert")
+				.html("All fields are necessary to submit the comment.")
+				.toggle(true);
+			return false;
 		}
 		
-		erpnext.blog.comment_dialog.show();
+		
-	});
+		$.ajax({
-
+			method: "POST",
-}
+			url: "server.py",
-
+			data: args,
-erpnext.blog.add_comment = function(wrapper) {
+			dataType: "json",
-	var args = erpnext.blog.comment_dialog.get_values();
+			success: function(data) {
-
+				if(data.exc) {
-	if(!args) return;
+					$("#comment-form .alert")
-	
+						.html(data.exc)
-	args.comment_doctype = 'Blog';
+						.toggle(true)
-	args.comment_docname = '{{ name }}';
+				} else {
-	args.page_name = '{{ page_name }}';
+					$(data.message).appendTo(".blog-comments");
-	
+					$(".no_comment").toggle(false);
-	wn.call({
+					$(".add-comment").toggle(false);
-		method: 'website.helpers.blog.add_comment',
+					$("#comment-form")
-		args: args,
+						.replaceWith("<div class='alert'>Thank you for your comment!</div>")
-		btn: this,
+				}
-		callback: function(r) {
-			if(!r.exc) {
-				erpnext.blog.add_comment_to_page(wrapper, r.message);
-				erpnext.blog.comment_dialog.hide();
 			}
-		}
+		})
-	});
-}
-
-erpnext.blog.add_comment_to_page = function(wrapper, comment) {
-	$blog_comments = $(wrapper).find('.blog-comments');
-	$comment_rows = $blog_comments.find('.comment-row');
-	
-	if ($comment_rows.length) {
-		$blog_comments.append(comment);
-	} else {
-		$blog_comments.append(comment);
-	}
-	
-	erpnext.blog.toggle_no_result(wrapper);
-	erpnext.blog.toggle_add_comment_btn(wrapper);
-}
-
-erpnext.blog.toggle_add_comment_btn = function(wrapper) {
-	var $wrapper = $(wrapper);
-	if ($wrapper.find('.blog-comments .comment-row').length > 50) {
-		var $comment_btn = $wrapper.find('button.add-comment');
-		$comment_btn.addClass('hide');
 		
-		// show comments are close
+		return false;
-		$wrapper.find('.blog-comments').append("\
+	})
-			<div class=\"help\"> \
+})
-				<p>Comments Closed</p> \
-				<br /> \
-			</div>");
-	}
-}

website/templates/js/login.js

@@ -1,13 +1,13 @@
 
-wn.provide('erpnext.login');
+var login = {};
 
 $(document).ready(function(wrapper) {
-	$('#login_btn').click(erpnext.login.doLogin)
+	$('#login_btn').click(login.do_login)
 		
 	$('#password').keypress(function(ev){
 		if(ev.which==13 && $('#password').val()) {
 			$('form').submit(function() {
-				erpnext.login.doLogin();
+				login.do_login();
 				return false;
 			});
 		}
@@ -16,54 +16,60 @@ $(document).ready(function(wrapper) {
 })
 
 // Login
-erpnext.login.doLogin = function(){
+login.do_login = function(){
 
     var args = {};
     args['usr']=$("#login_id").val();
     args['pwd']=$("#password").val();
 
 	if(!args.usr || !args.pwd) {
-		msgprint("Sorry, you can't login if you don't enter both the email id and password.")
+		login.set_message("Both login and password required.");
 	}
 
-	$('#login_btn').set_working();
+	$('#login_btn').attr("disabled", "disabled");
-	$('#login_message').empty();
+	$('#login_message').toggle(false);
+	
+	$.ajax({
+		type: "POST",
+		url: "server.py",
+		data: {cmd:"login", usr:args.usr, pwd: args.pwd},
+		dataType: "json",
+		success: function(data) {
+			$('#login_btn').attr("disabled", false);
+			if(data.message=="Logged In") {
+				window.location.href = "app.html";
+			} else {
+				login.set_message(data.message);
+			}
+		}
+	})
 	
-    $c("login", args, function(r, rtext) {
-		$('#login_btn').done_working();
-	    if(r.message=="Logged In"){
-	        window.location.href='app.html' + (get_url_arg('page') 
-				? ('?page='+get_url_arg('page')) : '');
-	    } else {
-	        $i('login_message').innerHTML = '<span style="color: RED;">'
-				+(r.message)+'</span>';
-	    }
-	});
-
 	return false;
 }
 
-
+login.show_forgot_password = function(){
-erpnext.login.show_forgot_password = function(){
     // create dialog
-	var d = new wn.ui.Dialog({
+	var login_id = $("#login_id").val();
-		title:"Forgot Password",
+	if(!login_id || !valid_email(login_id)) {
-		fields: [
+		login.set_message("Please set your login id (which is your email where the password will be sent);");
-			{'label':'Email Id', 'fieldname':'email_id', 'fieldtype':'Data', 'reqd':true},
+		return;
-			{'label':'Email Me A New Password', 'fieldname':'run', 'fieldtype':'Button'}
+	}
-		]
+	login.set_message("Sending email with new password...");
-	});
+	$("#forgot-password").remove();
 
-	$(d.fields_dict.run.input).click(function() {
+	$.ajax({
-		var values = d.get_values();
+		method: "POST",
-		if(!values) return;
+		url: "server.py",
-		wn.call({
+		data: {
-			method:'reset_password',
+			cmd: "reset_password",
-			args: { user: values.email_id },
+			user: login_id
-			callback: function() {
+		},
-				d.hide();
+		success: function(data) {
-			}
+			login.set_message("A new password has been sent to your email id.", "GREEN");
-		})
+		}
 	})
-	d.show();
+}
+
+login.set_message = function(message, color) {
+    $('#login_message').html(message).toggle(true);	
 }

website/templates/pages/blog.html

@@ -2,7 +2,6 @@
 
 {% block javascript %}
 	{% include "js/blog.js" %}
-	{% include "js/blog_subscribe.js" %}
 {% endblock %}
 
 {% block css %}
@@ -18,9 +17,12 @@
 			<div class="layout-main">
 				<h1>Blog</h1>
 				<br>
-				<div id="blog-list">
+				<div id="blog-list" style="min-height: 400px;">
 					<!-- blog list will be generated dynamically -->
 				</div>
+				<div style="text-align: center;">
+					<button id="next-page" class="btn">More...</button>
+				</div>
 			</div>
 		</div>
 	</div>

website/templates/pages/login.html

@@ -14,6 +14,7 @@
 {% block body %}
 	<div 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">
@@ -33,15 +34,12 @@
 									class="btn btn-small btn-primary">Login</button>
 							</td>
 						</tr>
-						<tr>
-							<td>&nbsp;</td>
-							<td id="login_message">&nbsp;</td>
-						</tr>
 						</tbody>
 				</table>
 			</form>
-			<p style="text-align: center"><span class="link_type" 
+			<br>
-				onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
+			<p style="text-align: center"><a id="forgot-password"
+				onclick="return login.show_forgot_password()">Forgot Password</a></p>
 		</div>
 		<div class="login-footer">
 			<a href="index.html">Home</a> | 

website/utils.py

@@ -33,6 +33,10 @@ page_map = {
 	'Item': webnotes._dict({
 		"template": 'html/product_page.html',
 		"condition_field": "show_in_website",
+	}),
+	'Item Group': webnotes._dict({
+		"template": "html/product_group.html",
+		"condition_field": "show_in_website"
 	})
 }
 
@@ -152,13 +156,14 @@ def get_template_pages():
 
 def get_doc_fields(page_name):
 	doc_type, doc_name = get_source_doc(page_name)
-	obj = webnotes.get_obj(doc_type, doc_name)
+	obj = webnotes.get_obj(doc_type, doc_name, with_children=True)
 
 	if hasattr(obj, 'prepare_template_args'):
 		obj.prepare_template_args()
 
 	args = obj.doc.fields
 	args['template'] = page_map[doc_type].template
+	args['obj'] = obj
 	
 	return args