update webpage name to be much longer, remove .html from links and refactor newsletter layout

website/helpers/sitemap.py

@@ -31,7 +31,7 @@ def generate(domain):
 				order by modified desc""" % (doctype, d.condition_field))
 		
 			for p in pages:
-				page_url = os.path.join(domain, urllib.quote(p[0]) + '.html')
+				page_url = os.path.join(domain, urllib.quote(p[0]))
 				modified = p[1].strftime('%Y-%m-%d')
 				site_map += link_xml % (page_url, modified)
 

website/templates/js/blog.js

@@ -53,7 +53,7 @@ var blog = {
 				b.comment_text = b.comments + ' comments.'
 			} 
 			
-			$(repl('<h2><a href="%(page_name)s.html">%(title)s</a></h2>\
+			$(repl('<h2><a href="%(page_name)s">%(title)s</a></h2>\
 				<div class="help">%(comment_text)s</div>\
 				%(content)s<br />\
 				<p><a href="%(page_name)s">Read with comments...</a></p>\

website/utils.py

@@ -97,7 +97,7 @@ def page_name(title):
 	import re
 	name = title.lower()
 	name = re.sub('[~!@#$%^&*()<>,."\']', '', name)
-	return '-'.join(name.split()[:4])
+	return '-'.join(name.split()[:8])
 
 def update_page_name(doc, title):
 	"""set page_name and check if it is unique"""
@@ -145,7 +145,7 @@ def prepare_args(page_name):
 	
 	if page_name in get_template_pages():
 		args = webnotes._dict({
-			'template': 'pages/%s.html' % page_name,
+			'template': 'pages/%s' % page_name,
 			'name': page_name,
 		})
 		if page_name in page_settings_map:
@@ -218,7 +218,7 @@ def get_outer_env():
 	if top_items and ("products" in [d.url.split(".")[0] for d in top_items if d.url]):
 		# product categories
 		products = webnotes.conn.sql("""select t1.item_group as label, 
-			concat(t2.page_name, ".html") as url,
+			t2.page_name as url,
 			ifnull(t1.indent,0) as indent
 			from `tabWebsite Product Category` t1, `tabItem Group` t2 
 			where t1.item_group = t2.name