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

website topbar fix, doclistnew, back fix

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-21 12:29:56 +05:30
parent fd563b4874
commit c01b7e9c75
8 changed files with 23 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
erpnext/website/Module Def/Website/Website.txt
View File

@ -1,142 +0,0 @@
# Module Def, Website
[
# These values are common in all dictionaries
{
'creation': '2012-01-23 17:05:32',
'docstatus': 0,
'modified': '2012-02-02 13:23:41',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Module Def Role
{
'doctype': 'Module Def Role',
'name': '__common__',
'parent': 'Website',
'parentfield': 'roles',
'parenttype': 'Module Def'
},
# These values are common for all Module Def Item
{
'doctype': 'Module Def Item',
'name': '__common__',
'parent': 'Website',
'parentfield': 'items',
'parenttype': 'Module Def'
},
# These values are common for all Module Def
{
'disabled': 'No',
'doctype': u'Module Def',
'is_hidden': 'No',
'module_label': 'Website',
'module_name': 'Website',
'name': '__common__'
},
# Module Def, Website
{
'doctype': u'Module Def',
'name': 'Website'
},
# Module Def Item
{
'display_name': 'Web Page',
'doc_name': 'Web Page',
'doc_type': 'Forms',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Product',
'doc_name': 'Product',
'doc_type': 'Forms',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Blog',
'doc_name': 'Blog',
'doc_type': 'Forms',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Style Settings',
'doc_name': 'Style Settings',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Website Settings',
'doc_name': 'Website Settings',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Home Settings',
'doc_name': 'Home Settings',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'About Us Settings',
'doc_name': 'About Us Settings',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Contact Us Settings',
'doc_name': 'Contact Us Settings',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Products Settings',
'doc_name': 'Products Settings',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'role': 'System Manager'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'role': 'System Manager'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'role': 'Website Manager'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'role': 'Website Manager'
}
]

26
erpnext/website/Role/Blogger/Blogger.txt
View File

@ -1,26 +0,0 @@
# Role, Blogger
[
# These values are common in all dictionaries
{
'creation': '2012-01-27 12:22:24',
'docstatus': 0,
'modified': '2012-01-27 12:22:24',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
# These values are common for all Role
{
'doctype': 'Role',
'module': u'Website',
'name': '__common__',
'role_name': u'Blogger'
},
# Role, Blogger
{
'doctype': 'Role',
'name': u'Blogger'
}
]

26
erpnext/website/Role/Website Manager/Website Manager.txt
View File

@ -1,26 +0,0 @@
# Role, Website Manager
[
# These values are common in all dictionaries
{
'creation': '2012-01-24 10:18:47',
'docstatus': 0,
'modified': '2012-02-06 15:22:27',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
# These values are common for all Role
{
'doctype': 'Role',
'module': u'Website',
'name': '__common__',
'role_name': u'Website Manager'
},
# Role, Website Manager
{
'doctype': 'Role',
'name': u'Website Manager'
}
]

4
erpnext/website/__init__.py
View File

@ -0,0 +1,4 @@
install_docs = [
{"doctype":"Role", "name":"Blogger"},
{"doctype":"Role", "name":"Website Manager"},
]

4
erpnext/website/js/topbar.js
View File

@ -24,7 +24,7 @@ wn.provide('erpnext.navbar');
</li>\
*/
erpnext.navbar.navbar = Class.extend({
erpnext.navbar.Navbar = Class.extend({
init: function() {
this.make();
$('.brand').html(wn.boot.website_settings.brand_html);
@ -113,5 +113,5 @@ erpnext.Footer = Class.extend({
$(document).bind('startup', function() {
// erpnext.footer = new erpnext.Footer();
// erpnext.navbar.navbar = new erpnext.navbar.navbar();
erpnext.navbar.navbar = new erpnext.navbar.Navbar();
})

8
js/all-app.js
View File

@ -364,7 +364,13 @@ wn.views.DocListView=wn.ui.Listing.extend({init:function(doctype,page){this.doct
<div style="clear: both"></div>\
</div>',{label:this.label}));},setup:function(){var me=this;me.can_delete=wn.model.can_delete(me.doctype);me.meta=locals.DocType[me.doctype];me.$page.find('.wnlist-area').empty(),me.setup_docstatus_filter();me.setup_listview();me.init_list();me.init_stats();me.add_delete_option();},setup_docstatus_filter:function(){var me=this;this.can_submit=$.map(locals.DocPerm,function(d){if(d.parent==me.meta.name&&d.submit)return 1
else return null;}).length;if(this.can_submit){this.$page.find('.show-docstatus').removeClass('hide');this.$page.find('.show-docstatus input').click(function(){me.run();})}},setup_listview:function(){if(this.meta.__listjs){eval(this.meta.__listjs);this.listview=new wn.doclistviews[this.doctype](this);}else{this.listview=new wn.views.ListView(this);}
this.listview.parent=this;},init_list:function(){this.make({method:'webnotes.widgets.doclistview.get',get_args:this.get_args,parent:this.$page.find('.wnlist-area'),start:0,page_length:20,show_filters:true,show_grid:true,new_doctype:this.doctype,allow_delete:true,columns:this.listview.fields});this.run();},render_row:function(row,data){data.doctype=this.doctype;this.listview.render(row,data,this);},get_query_fields:function(){return this.listview.fields;},get_args:function(){return{doctype:this.doctype,fields:this.get_query_fields(),filters:this.filter_list.get_filters(),docstatus:this.can_submit?$.map(this.$page.find('.show-docstatus :checked'),function(inp){return $(inp).attr('data-docstatus')}):[]}},add_delete_option:function(){var me=this;if(this.can_delete){this.add_button('<a class="btn btn-small btn-delete">\
this.listview.parent=this;},init_list:function(){this.make({method:'webnotes.widgets.doclistview.get',get_args:this.get_args,parent:this.$page.find('.wnlist-area'),start:0,page_length:20,show_filters:true,show_grid:true,new_doctype:this.doctype,allow_delete:true,no_result_message:this.make_no_result(),columns:this.listview.fields});this.run();},make_no_result:function(){return repl('<div class="well"><p>No %(doctype)s found</p>\
%(description)s\
<hr>\
<p><button class="btn btn-info btn-small"\
onclick="wn.set_route(\'Form\', \'New %(doctype)s\');"\
>Make a new %(doctype)s</button>\
</p></div>',{doctype:this.doctype,description:locals.DocType[this.doctype].description||''});},render_row:function(row,data){data.doctype=this.doctype;this.listview.render(row,data,this);},get_query_fields:function(){return this.listview.fields;},get_args:function(){return{doctype:this.doctype,fields:this.get_query_fields(),filters:this.filter_list.get_filters(),docstatus:this.can_submit?$.map(this.$page.find('.show-docstatus :checked'),function(inp){return $(inp).attr('data-docstatus')}):[]}},add_delete_option:function(){var me=this;if(this.can_delete){this.add_button('<a class="btn btn-small btn-delete">\
<i class="icon-remove"></i> Delete</a>',function(){me.delete_items();},'.btn-filter')}},delete_items:function(){var me=this;var dl=$.map(me.$page.find('.list-delete:checked'),function(e){return $(e).data('name');});if(!dl.length)
return;if(!confirm('This is PERMANENT action and you cannot undo. Continue?')){return;}
me.set_working(true);wn.call({method:'webnotes.widgets.doclistview.delete_items',args:{items:dl,doctype:me.doctype},callback:function(){me.set_working(false);me.refresh();}})},init_stats:function(){var me=this

12
js/all-web.js
View File

@ -278,7 +278,13 @@ wn.views.DocListView=wn.ui.Listing.extend({init:function(doctype,page){this.doct
<div style="clear: both"></div>\
</div>',{label:this.label}));},setup:function(){var me=this;me.can_delete=wn.model.can_delete(me.doctype);me.meta=locals.DocType[me.doctype];me.$page.find('.wnlist-area').empty(),me.setup_docstatus_filter();me.setup_listview();me.init_list();me.init_stats();me.add_delete_option();},setup_docstatus_filter:function(){var me=this;this.can_submit=$.map(locals.DocPerm,function(d){if(d.parent==me.meta.name&&d.submit)return 1
else return null;}).length;if(this.can_submit){this.$page.find('.show-docstatus').removeClass('hide');this.$page.find('.show-docstatus input').click(function(){me.run();})}},setup_listview:function(){if(this.meta.__listjs){eval(this.meta.__listjs);this.listview=new wn.doclistviews[this.doctype](this);}else{this.listview=new wn.views.ListView(this);}
this.listview.parent=this;},init_list:function(){this.make({method:'webnotes.widgets.doclistview.get',get_args:this.get_args,parent:this.$page.find('.wnlist-area'),start:0,page_length:20,show_filters:true,show_grid:true,new_doctype:this.doctype,allow_delete:true,columns:this.listview.fields});this.run();},render_row:function(row,data){data.doctype=this.doctype;this.listview.render(row,data,this);},get_query_fields:function(){return this.listview.fields;},get_args:function(){return{doctype:this.doctype,fields:this.get_query_fields(),filters:this.filter_list.get_filters(),docstatus:this.can_submit?$.map(this.$page.find('.show-docstatus :checked'),function(inp){return $(inp).attr('data-docstatus')}):[]}},add_delete_option:function(){var me=this;if(this.can_delete){this.add_button('<a class="btn btn-small btn-delete">\
this.listview.parent=this;},init_list:function(){this.make({method:'webnotes.widgets.doclistview.get',get_args:this.get_args,parent:this.$page.find('.wnlist-area'),start:0,page_length:20,show_filters:true,show_grid:true,new_doctype:this.doctype,allow_delete:true,no_result_message:this.make_no_result(),columns:this.listview.fields});this.run();},make_no_result:function(){return repl('<div class="well"><p>No %(doctype)s found</p>\
%(description)s\
<hr>\
<p><button class="btn btn-info btn-small"\
onclick="wn.set_route(\'Form\', \'New %(doctype)s\');"\
>Make a new %(doctype)s</button>\
</p></div>',{doctype:this.doctype,description:locals.DocType[this.doctype].description||''});},render_row:function(row,data){data.doctype=this.doctype;this.listview.render(row,data,this);},get_query_fields:function(){return this.listview.fields;},get_args:function(){return{doctype:this.doctype,fields:this.get_query_fields(),filters:this.filter_list.get_filters(),docstatus:this.can_submit?$.map(this.$page.find('.show-docstatus :checked'),function(inp){return $(inp).attr('data-docstatus')}):[]}},add_delete_option:function(){var me=this;if(this.can_delete){this.add_button('<a class="btn btn-small btn-delete">\
<i class="icon-remove"></i> Delete</a>',function(){me.delete_items();},'.btn-filter')}},delete_items:function(){var me=this;var dl=$.map(me.$page.find('.list-delete:checked'),function(e){return $(e).data('name');});if(!dl.length)
return;if(!confirm('This is PERMANENT action and you cannot undo. Continue?')){return;}
me.set_working(true);wn.call({method:'webnotes.widgets.doclistview.delete_items',args:{items:dl,doctype:me.doctype},callback:function(){me.set_working(false);me.refresh();}})},init_stats:function(){var me=this
@ -1243,7 +1249,7 @@ $(document).bind('startup',function(){erpnext.startup.start();});
/*
* erpnext/website/js/topbar.js
*/
wn.provide('erpnext.navbar');erpnext.navbar.navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('<div class="navbar navbar-fixed-top">\
wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('<div class="navbar navbar-fixed-top">\
<div class="navbar-inner">\
<div class="container">\
<a class="brand">[brand]</a>\
@ -1267,4 +1273,4 @@ item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(r
<a href="https://erpnext.com">erpnext.com</a></div>\
</div>',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus
for(var i=0;i<items.length;i++){var item=items[i];if(!item.parent_label&&item.parentfield=='footer_items'){item.route=item.url||item.custom_page;$('.web-footer-menu ul').append(repl('<li><a href="#!%(route)s" \
data-label="%(label)s">%(label)s</a></li>',item))}}}});$(document).bind('startup',function(){})
data-label="%(label)s">%(label)s</a></li>',item))}}}});$(document).bind('startup',function(){erpnext.navbar.navbar=new erpnext.navbar.Navbar();})

2
version.num
View File

@ -1 +1 @@
1291
1297