Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Conflicts:
	utilities/doctype/address/address.txt
This commit is contained in:
Anand Doshi
2013-07-02 11:43:54 +05:30
32 changed files with 210 additions and 121 deletions

View File

@@ -5,6 +5,7 @@ wn.module_page["Website"] = [
{
title: wn._("Web Content"),
icon: "icon-copy",
top: true,
items: [
{
label: wn._("Web Page"),
@@ -12,20 +13,20 @@ wn.module_page["Website"] = [
doctype:"Web Page"
},
{
label: wn._("Website Slideshow"),
description: wn._("Embed image slideshows in website pages."),
doctype:"Website Slideshow"
label: wn._("Blog Post"),
description: wn._("Single Post (article)."),
doctype:"Blog Post"
},
]
},
{
title: wn._("Blog"),
title: wn._("Documents"),
icon: "icon-edit",
items: [
{
label: wn._("Blog Post"),
description: wn._("Single Post (article)."),
doctype:"Blog Post"
label: wn._("Website Slideshow"),
description: wn._("Embed image slideshows in website pages."),
doctype:"Website Slideshow"
},
{
label: wn._("Blogger"),