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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-17 08:18:30 +01:00
commit 7b7af279cf
12 changed files with 85 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/all-app.css
View File

@ -119,6 +119,13 @@ li {
line-height: 1.5em;
}
hr {
margin: 18px 0;
border: 0;
border-top: 1px solid #e5e5e5;
border-bottom: 1px solid #ffffff;
}
a:active { outline:none; }
:focus { -moz-outline-style:none; }

22
css/all-web.css
View File

@ -119,6 +119,13 @@ li {
line-height: 1.5em;
}
hr {
margin: 18px 0;
border: 0;
border-top: 1px solid #e5e5e5;
border-bottom: 1px solid #ffffff;
}
a:active { outline:none; }
:focus { -moz-outline-style:none; }
@ -1044,6 +1051,14 @@ h1 {
margin-bottom: 15px;
}
h2 {
margin-bottom: 11px;
}
h3 {
margin-bottom: 7px;
}
pre {
background-color: #F8F8F8;
border: 1px solid #CCCCCC;
@ -1078,13 +1093,6 @@ header .topbar .container {
margin-bottom: 20px;
}
.web-main-section p,
.web-main-section h4,
.web-main-section h5,
.web-main-section pre {
margin-left: 9px;
}
.web-side-section {
width: 30%;
float: right;

15
erpnext/website/css/website.css
View File

@ -11,6 +11,14 @@ h1 {
margin-bottom: 15px;
}
h2 {
margin-bottom: 11px;
}
h3 {
margin-bottom: 7px;
}
pre {
background-color: #F8F8F8;
border: 1px solid #CCCCCC;
@ -45,13 +53,6 @@ header .topbar .container {
margin-bottom: 20px;
}
.web-main-section p,
.web-main-section h4,
.web-main-section h5,
.web-main-section pre {
margin-left: 9px;
}
.web-side-section {
width: 30%;
float: right;

2
erpnext/website/doctype/blog/blog_page.js
View File

@ -21,7 +21,7 @@ pscript['onload_{{ doc.name }}'] = function(wrapper) {
// comments
$(wrapper).find('.web-main-section').append('<h3>Comments</h3>');
$(wrapper).find('.web-main-section').append('<hr><h3>Comments</h3>');
wrapper.comment_list = new wn.widgets.Listing({
parent: $(wrapper).find('.web-main-section').get(0),

7
erpnext/website/doctype/web_page/web_page.py
View File

@ -32,6 +32,7 @@ class DocType:
website.utils.add_guest_access_to_page(p.name)
self.cleanup_temp()
self.if_home_clear_cache()
def add_page_links(self):
"""add links for next_page and see_also"""
@ -55,3 +56,9 @@ class DocType:
if f in self.doc.fields:
del self.doc.fields[f]
def if_home_clear_cache(self):
"""if home page, clear cache"""
if webnotes.conn.get_value("Website Settings", None, "home_page")==self.doc.name:
from webnotes.session_cache import clear_cache
clear_cache('Guest')

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

@ -13,6 +13,7 @@ erpnext.topbar.TopBar = Class.extend({
this.make();
$('.brand').html(wn.boot.website_settings.brand_html);
this.make_items();
$('.topbar').dropdown();
},
make: function() {
$('header').append('<div class="topbar">\
@ -31,13 +32,32 @@ erpnext.topbar.TopBar = Class.extend({
$('.brand').attr('href', '#!' + (wn.boot.website_settings.home_page || 'Login Page'))
},
make_items: function() {
var items = wn.boot.website_menus
var items = wn.boot.website_menus;
// parent labels
for(var i=0;i<items.length;i++) {
var item = items[i];
if(!item.parent_label && item.parentfield=='top_bar_items') {
item.route = item.url || item.custom_page;
$('header .nav:first').append(repl('<li><a href="#!%(route)s" \
data-label="%(label)s">%(label)s</a></li>', item))
$('header .nav:first').append(repl('<li data-label="%(label)s">\
<a href="#!%(route)s">%(label)s</a></li>', item))
}
}
// child labels
for(var i=0;i<items.length;i++) {
var item = items[i];
if(item.parent_label && item.parentfield=='top_bar_items') {
// check if parent label has class "dropdown"
$parent_li = $(repl('header li[data-label="%(parent_label)s"]', item));
if(!$parent_li.hasClass('dropdown')) {
$parent_li.addClass('dropdown');
$parent_li.find('a:first').addClass('dropdown-toggle');
$parent_li.append('<ul class="dropdown-menu"></ul>');
}
item.route = item.url || item.custom_page;
$parent_li.find('.dropdown-menu').append(repl('<li data-label="%(label)s">\
<a href="#!%(route)s">%(label)s</a></li>', item))
}
}
}

2
erpnext/website/page/contact/contact.py
View File

@ -1,6 +1,6 @@
import json, webnotes
@webnotes.whitelist()
@webnotes.whitelist(allow_guest=True)
def send(args):
"""create support ticket"""
args = json.loads(args)

2
erpnext/website/page/products/products.js
View File

@ -67,7 +67,7 @@ erpnext.products.make_product_list = function(wrapper) {
<div style="float:left; width: 400px">\
<p><b><a href="#!%(page_name)s">%(title)s</a></b></p>\
<p>%(short_description)s</p></div>\
<div style="clear: both; margin-bottom: 15px; border-bottom: 1px solid #AAA"></div>', data);
<div style="clear: both;"></div><hr />', data);
}
});
}

3
index.cgi
View File

@ -11,6 +11,7 @@ sys.path.append('erpnext')
import webnotes
import webnotes.handler
import webnotes.auth
import webnotes.defs
def init():
# make the form_dict
@ -23,6 +24,8 @@ def init():
webnotes.http_request = webnotes.auth.HTTPRequest()
except webnotes.AuthenticationError, e:
pass
except webnotes.defs.IllegalDomainException, e:
print "Location: " + (webnotes.defs.redirect_404)
def respond():
import webnotes

10
js/all-app.js
View File

@ -554,7 +554,10 @@ $dh(this.input_area);$ds(this.disp_area);}else{if(this.hide)this.hide();else $dh
this.set_status=this.disp_status;}}
Field.prototype.refresh=function(){this.disp_status=this.get_status();if(this.in_grid&&this.table_refresh&&this.disp_status=='Write')
{this.table_refresh();return;}
this.set_label();this.refresh_display();if(this.onrefresh)this.onrefresh();if(this.input&&this.input.refresh)this.input.refresh(this.df);if(!this.not_in_form)
this.set_label();this.refresh_display();if(this.onrefresh)
this.onrefresh();if(this.input){if(this.input.refresh)this.input.refresh(this.df);}
if(this.wrapper){this.wrapper.fieldobj=this;$(this.wrapper).trigger('refresh');}
if(!this.not_in_form)
this.set_input(_f.get_value(this.doctype,this.docname,this.df.fieldname));this.refresh_mandatory();this.set_max_width();}
Field.prototype.refresh_label_icon=function(){if(this.df.reqd){if(this.get_value&&is_null(this.get_value())){if(this.label_icon)$ds(this.label_icon);$(this.txt?this.txt:this.input).addClass('field-to-update')}else{if(this.label_icon)$dh(this.label_icon);$(this.txt?this.txt:this.input).removeClass('field-to-update')}}}
Field.prototype.set=function(val){if(this.not_in_form)
@ -1486,7 +1489,10 @@ $dh(this.input_area);$ds(this.disp_area);}else{if(this.hide)this.hide();else $dh
this.set_status=this.disp_status;}}
Field.prototype.refresh=function(){this.disp_status=this.get_status();if(this.in_grid&&this.table_refresh&&this.disp_status=='Write')
{this.table_refresh();return;}
this.set_label();this.refresh_display();if(this.onrefresh)this.onrefresh();if(this.input&&this.input.refresh)this.input.refresh(this.df);if(!this.not_in_form)
this.set_label();this.refresh_display();if(this.onrefresh)
this.onrefresh();if(this.input){if(this.input.refresh)this.input.refresh(this.df);}
if(this.wrapper){this.wrapper.fieldobj=this;$(this.wrapper).trigger('refresh');}
if(!this.not_in_form)
this.set_input(_f.get_value(this.doctype,this.docname,this.df.fieldname));this.refresh_mandatory();this.set_max_width();}
Field.prototype.refresh_label_icon=function(){if(this.df.reqd){if(this.get_value&&is_null(this.get_value())){if(this.label_icon)$ds(this.label_icon);$(this.txt?this.txt:this.input).addClass('field-to-update')}else{if(this.label_icon)$dh(this.label_icon);$(this.txt?this.txt:this.input).removeClass('field-to-update')}}}
Field.prototype.set=function(val){if(this.not_in_form)

15
js/all-web.js
View File

@ -463,7 +463,10 @@ $dh(this.input_area);$ds(this.disp_area);}else{if(this.hide)this.hide();else $dh
this.set_status=this.disp_status;}}
Field.prototype.refresh=function(){this.disp_status=this.get_status();if(this.in_grid&&this.table_refresh&&this.disp_status=='Write')
{this.table_refresh();return;}
this.set_label();this.refresh_display();if(this.onrefresh)this.onrefresh();if(this.input&&this.input.refresh)this.input.refresh(this.df);if(!this.not_in_form)
this.set_label();this.refresh_display();if(this.onrefresh)
this.onrefresh();if(this.input){if(this.input.refresh)this.input.refresh(this.df);}
if(this.wrapper){this.wrapper.fieldobj=this;$(this.wrapper).trigger('refresh');}
if(!this.not_in_form)
this.set_input(_f.get_value(this.doctype,this.docname,this.df.fieldname));this.refresh_mandatory();this.set_max_width();}
Field.prototype.refresh_label_icon=function(){if(this.df.reqd){if(this.get_value&&is_null(this.get_value())){if(this.label_icon)$ds(this.label_icon);$(this.txt?this.txt:this.input).addClass('field-to-update')}else{if(this.label_icon)$dh(this.label_icon);$(this.txt?this.txt:this.input).removeClass('field-to-update')}}}
Field.prototype.set=function(val){if(this.not_in_form)
@ -1134,7 +1137,7 @@ $(document).bind('startup',function(){erpnext.startup.start();});
/*
* erpnext/website/js/topbar.js
*/
wn.provide('erpnext.topbar');erpnext.topbar.TopBar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();},make:function(){$('header').append('<div class="topbar">\
wn.provide('erpnext.topbar');erpnext.topbar.TopBar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.topbar').dropdown();},make:function(){$('header').append('<div class="topbar">\
<div class="topbar-inner">\
<div class="container">\
<a class="brand">[brand]</a>\
@ -1146,9 +1149,11 @@ wn.provide('erpnext.topbar');erpnext.topbar.TopBar=Class.extend({init:function()
</ul>\
</div>\
</div>\
</div>');$('.brand').attr('href','#!'+(wn.boot.website_settings.home_page||'Login Page'))},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=='top_bar_items'){item.route=item.url||item.custom_page;$('header .nav:first').append(repl('<li><a href="#!%(route)s" \
data-label="%(label)s">%(label)s</a></li>',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('<div class="web-footer">\
</div>');$('.brand').attr('href','#!'+(wn.boot.website_settings.home_page||'Login Page'))},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=='top_bar_items'){item.route=item.url||item.custom_page;$('header .nav:first').append(repl('<li data-label="%(label)s">\
<a href="#!%(route)s">%(label)s</a></li>',item))}}
for(var i=0;i<items.length;i++){var item=items[i];if(item.parent_label&&item.parentfield=='top_bar_items'){$parent_li=$(repl('header li[data-label="%(parent_label)s"]',item));if(!$parent_li.hasClass('dropdown')){$parent_li.addClass('dropdown');$parent_li.find('a:first').addClass('dropdown-toggle');$parent_li.append('<ul class="dropdown-menu"></ul>');}
item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(repl('<li data-label="%(label)s">\
<a href="#!%(route)s">%(label)s</a></li>',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('<div class="web-footer">\
<div class="web-footer-menu"><ul></ul></div>\
<div class="web-footer-address">%(address)s</div>\
<div class="web-footer-copyright">&copy; %(copyright)s</div>\

2
version.num
View File

@ -1 +1 @@
427
438