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

fix in issues arising due to wn.require

Browse Source
This commit is contained in:
Anand Doshi 2012-05-10 14:19:11 +05:30
parent 45b187ded1
commit 951d8ec342
11 changed files with 316 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.json
View File

@ -16,5 +16,14 @@
"erpnext/startup/js/toolbar.js",
"erpnext/startup/js/feature_setup.js",
"conf.js"
]
],
"public/js/kb_common.js": [
"erpnext/utilities/page/kb_common/kb_common.js",
],
"public/js/complete_setup.js": [
"erpnext/startup/js/complete_setup.js",
],
"public/js/product_category.js": [
"erpnext/website/js/product_category.js",
],
}

2
erpnext/startup/startup.js
View File

@ -76,7 +76,7 @@ erpnext.startup.start = function() {
// complete registration
if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) {
wn.require("erpnext/startup/js/complete_setup.js");
wn.require("js/complete_setup.js");
erpnext.complete_setup.show();
}
if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {

2
erpnext/utilities/page/questions/questions.js
View File

@ -220,4 +220,4 @@ KBQuestion = function(parent, det, kb) {
this.make()
}
wn.require('erpnext/utilities/page/kb_common/kb_common.js');
wn.require('js/kb_common.js');

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

@ -16,7 +16,7 @@
erpnext.products = {}
wn.require('erpnext/website/js/product_category.js');
wn.require('js/product_category.js');
pscript.onload_products = function(wrapper) {
erpnext.make_product_categories(wrapper);

134
public/css/wn-web.css
View File

@ -0,0 +1,134 @@
#body_div {
background: url("../files/indian-textile-5.gif") repeat;
font-family: 'Arial', Verdana, Sans !important;
font-size: 14px !important;
}
.small {
font-size: 12px !important;
}
h1, h2, h3, h4, h5 {
font-family: 'Arial', Arial, 'Helvetica Neue' !important;
}
/* User CSS */
hr {
clear: both;
}
p {
margin-top: 2px;
}
.hand {
font-family: Pacifico;
font-size: 18px;
}
h1.top {
text-align: center;
}
.sub-head {
text-align: center;
color: #888;
font-size: 18px;
margin: 10px 0px;
}
.layout-main, .layout-main-section {
padding: 50px;
}
.layout-main-section {
width: 60%;
}
.layout-side-section {
padding-top: 50px;
}
h2 {
//font-family: Pacifico;
font-size: 20px;
font-weight: bold;
color: #CC0000;
padding: 25px 0px 25px 0px;
clear: both;
text-align: left;
}
.center {
text-align: center;
}
.left {
width: 375px;
padding-right: 25px;
float: left;
}
.right {
width: 375px;
padding-left: 25px;
float: left;
}
.page-footer {
clear: both;
margin: -50px;
margin-top: 50px;
background-color: #FFFAED;
padding: 50px;
}
.page-footer input {
width: 140px;
font-size: 17px;
padding: 4px;
margin-top: 2px;
}
.page-footer .section-head {
padding: 0px;
margin-bottom: 7px;
}
.green {
color: green;
}
.web-form input, .web-form textarea {
width: 400px;
font-size: 17px;
padding: 4px;
}
.link-big {
font-size: 140%;
}
.sticky {
background-color: #F0EDDD;
padding: 15px;
margin-left: 15px;
font-size: 12px;
color: #444;
width: 240px;
min-height: 120px;
float: right;
box-shadow: 2px 2px 6px #973;
}

2
public/js/all-app.js
View File

@ -2256,7 +2256,7 @@ wn.provide('wn.modules');$.extend(wn.modules,erpnext.modules);wn.modules['Core']
erpnext.startup.start=function(){console.log('Starting up...');$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(user!='Guest'){if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();}
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("js/complete_setup.js");erpnext.complete_setup.show();}
if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('<div class="expiry-info"> \
Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \
Please renew your subscription to continue using ERPNext \

2
public/js/all-web.js
View File

@ -710,7 +710,7 @@ wn.provide('wn.modules');$.extend(wn.modules,erpnext.modules);wn.modules['Core']
erpnext.startup.start=function(){console.log('Starting up...');$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(user!='Guest'){if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();}
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("js/complete_setup.js");erpnext.complete_setup.show();}
if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('<div class="expiry-info"> \
Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \
Please renew your subscription to continue using ERPNext \

10
public/js/complete_setup.js Normal file
View File

File diff suppressed because one or more lines are too long

29
public/js/kb_common.js Normal file
View File

@ -0,0 +1,29 @@
/*
* erpnext/utilities/page/kb_common/kb_common.js
*/
KBItemToolbar=function(args,kb){$.extend(this,args);var me=this;this.make=function(){this.wrapper=$a(this.parent,'div','',{});this.line1=$a(this.wrapper,'div','',{color:'#888',fontSize:'11px',margin:'7px 0px'});this.make_timestamp();if(this.with_tags)
this.make_tags();this.setup_del();}
this.make_timestamp=function(){this.line1.innerHTML=repl('By %(name)s | %(when)s',{name:wn.utils.full_name(this.det.first_name,this.det.last_name),when:wn.datetime.comment_when(this.det.modified)});if(has_common(user_roles,['Administrator','System Manager'])){this.line1.innerHTML+=' | <a style="cursor:pointer;"\
class="del-link">delete</a>';}}
this.make_tags=function(){this.line1.innerHTML+=' | '
this.tags_area=$a(this.line1,'span','kb-tags')
this.tags=new TagList(this.tags_area,this.det._user_tags&&(this.det._user_tags.split(',')),this.doctype,this.det.name,0,kb.set_tag_filter)}
this.setup_del=function(){$(this.line1).find('.del-link').click(function(){console.log(1);this.innerHTML='deleting...';this.disabled=1;$c_page('utilities','questions','delete',{dt:me.doctype,dn:me.det.name},function(r,rt){kb.list.run()});});}
this.make();}
EditableText=function(args){$.extend(this,args);var me=this;me.$w=$(repl('<div class="ed-text">\
<div class="ed-text-display %(disp_class)s"></div>\
<a class="ed-text-edit" style="cursor: pointer; float: right; margin-top: -16px;">[edit]</a>\
<textarea class="ed-text-input %(inp_class)s hide"></textarea>\
<div class="help hide"><br>Formatted as <a href="http://en.wikipedia.org/wiki/Markdown#Syntax_examples"\
target="_blank">markdown</a></div>\
<button class="btn btn-small btn-info hide ed-text-save">Save</button>\
<a class="ed-text-cancel hide" style="cursor: pointer;">Cancel</a>\
</div>',args)).appendTo(me.parent);this.set_display=function(txt){me.$w.find('.ed-text-display').html(wn.markdown(txt));me.text=txt;}
this.set_display(me.text);if(me.height)me.$w.find('.ed-text-input').css('height',me.height);me.$w.find('.ed-text-edit').click(function(){me.$w.find('.ed-text-input').val(me.text);me.show_as_input();})
me.$w.find('.ed-text-save').click(function(){var v=me.$w.find('.ed-text-input').val();if(!v){msgprint('Please write something!');return;}
var btn=this;$(btn).set_working();$c_page('utilities','question_view','update_item',{dt:me.dt,dn:me.dn,fn:me.fieldname,text:v},function(r){$(btn).done_working();if(r.exc){msgprint(r.exc);return;}
me.set_display(v);me.show_as_text();});})
me.$w.find('.ed-text-cancel').click(function(){me.show_as_text();})
this.show_as_text=function(){me.$w.find('.ed-text-display, .ed-text-edit').toggle(true);me.$w.find('.ed-text-input, .ed-text-save, .ed-text-cancel, .help').toggle(false);}
this.show_as_input=function(){me.$w.find('.ed-text-display, .ed-text-edit').toggle(false);me.$w.find('.ed-text-input, .ed-text-save, .ed-text-cancel, .help').toggle(true);}}

7
public/js/product_category.js Normal file
View File

@ -0,0 +1,7 @@
/*
* erpnext/website/js/product_category.js
*/
erpnext.make_product_categories=function(wrapper){wrapper.category_list=new wn.ui.Listing({parent:$(wrapper).find('.more-categories').get(0),query:'select count(name) as items, item_group \
from tabItem where is_sales_item="Yes" \
group by item_group order by items desc',hide_refresh:true,render_row:function(parent,data){parent.innerHTML=repl('<a href="#!products/%(item_group)s">%(item_group)s</a> (%(items)s)',data);}});wrapper.category_list.run();}

122
public/js/wn-web.js
View File

@ -1 +1,121 @@
window.home_page = "Login Page";
window.home_page = "home";
// footer signup widget
// automatically adds it to the .layout-main div of the page
// adds events and also random goodies.
erpnext.set_request_signup = function(page_name) {
// goodies
var goodies = [
"ERPNext also contains a module to build your website. \
The way it works is, when you log out, the app becomes your website. \
This website is generated from ERPNext.",
"You can add custom fields to your transactions in ERPNext to \
capture specific information about your business.",
"All forms in ERPNext can be customized, if you feel there are \
features you do not want to use, you can hide them.",
"You can email transactions like Quotations and Invoices directly \
from the system. You can also set this process to become automatic",
"You can create your own Roles and assign user to those roles. \
You can also set detailed permissions for each role in transactions.",
"ERPNext allows you to assign any transaction like an Invoice \
or Customer Issue to a user. You can also add comments on any \
transaction.",
"Stay on top with a daily, weekly or montly email summarizing all your business\
activites and accounting data like Income, Receivables, Paybles etc.",
"Integrate incoming Support queries to your email into ERPNext. \
Keep track of open tickets and allocate tickets to your users."
];
// add the footer
$('#page-' + page_name + ' .layout-main').append('<div class="page-footer">\
<h2 style="padding: 0px">Try before you buy. \
Request a 30-day Free Trial.</h2>\
<ul>\
<li><a href="erpnext-pricing.html">Starts at an un-believable $299 per year.</a>\
<li><a href="http://demo.erpnext.com" target="_blank">\
Show me a full demo (new page).</a>\
<li><a href="sign-up.html">Take me to the sign-up page.</a>\
</ul>\
<p>\
<i class="icon-hand-right"></i> <b>ERPNext Goodies:</b> <span class="goodie">'
+ goodies[parseInt(Math.random() * goodies.length)]+
'</goodie></p>\
<p>ERPNext is <a href="open-source.html">Open Source</a> under the GNU/General Public License.</p>\
<p><g:plusone size="medium" annotation="inline"></g:plusone></p>\
\
<table><tr><td style="width: 115px">\
<a href="https://twitter.com/erpnext" class="twitter-follow-button" \
data-show-count="false">Follow @erpnext</a></td>\
<td style="width: 150px; font-size: 80%; vertical-align: middle;">\
Get status updates on Twitter.</td></tr>\
</table>');
// render plusone
window.gapi && window.gapi.plusone.go();
// render twitter button
twttr.widgets.load();
}
//////////////// Hide Login for frappe!
$(document).ready(function() {
setTimeout("$('#login-topbar-item').toggle(false);", 1000);
});
//////////////// Analytics
window._gaq = window._gaq || [];
window._gaq.push(['_setAccount', 'UA-8911157-1']);
window._gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
/////////////// Page view
$(window).bind('hashchange', function() {
window._gaq.push(['_trackPageview', wn.get_route_str()]);
});
/////////////// Update conversion
erpnext.update_conversion = function() {
$('body').append('<div style="display:inline;">\
<img height="1" width="1" style="border-style:none;" alt="" \
src="http://www.googleadservices.com/pagead/conversion/1032834481/?label=JvAUCLX41gEQsZu_7AM&amp;guid=ON&amp;script=0"/>\
</div>')
};
////////////// Plus One
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
////////////// Twitter
(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];
if(!d.getElementById(id)){js=d.createElement(s);js.id=id;
js.src="//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js,fjs);}})(document,"script","twitter-wjs");