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

fixes to buttons etc

Browse Source
This commit is contained in:
Rushabh Mehta 2011-09-08 15:45:37 +05:30
parent 8cf45175a7
commit 5caedffff8
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/_timestamps.js
View File

File diff suppressed because one or more lines are too long

10
erpnext/home/page/dashboard/dashboard.js
View File

@ -1,11 +1,11 @@
pscript.onload_dashboard = function() { pscript.onload_dashboard = function() {
// load jqplot // load jqplot
$.scriptPath = 'js/' $.scriptPath = 'js/'
$.require(['jquery/jquery.jqplot.min.js', wn.require('lib/js/legacy/jquery/jquery.jqplot.min.js');
'jquery/jqplot-plugins/jqplot.barRenderer.js', wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.barRenderer.js');
'jquery/jqplot-plugins/jqplot.canvasAxisTickRenderer.min.js', wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.canvasAxisTickRenderer.min.js');
'jquery/jqplot-plugins/jqplot.canvasTextRenderer.min.js', wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.canvasTextRenderer.min.js');
'jquery/jqplot-plugins/jqplot.categoryAxisRenderer.min.js']); wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.categoryAxisRenderer.min.js');
pscript.dashboard_settings = { pscript.dashboard_settings = {

4
erpnext/home/page/event_updates/event_updates.js
View File

@ -123,7 +123,7 @@ HomeWidget = function(parent, heading, item) {
this.footer = $a(this.wrapper,'div'); this.footer = $a(this.wrapper,'div');
// add button // add button
this.add_btn = $btn(this.footer,'+ Add ' + item,function(){me.add()}); this.add_btn = $btn(this.footer,'+ Add ' + item,function(){me.add()},null,'cupid-blue');
// refresh // refresh
this.refresh_btn = $ln(this.footer,'Refresh',function() { me.refresh(); },{fontSize:'11px',marginLeft:'7px',color:'#888'}); this.refresh_btn = $ln(this.footer,'Refresh',function() { me.refresh(); },{fontSize:'11px',marginLeft:'7px',color:'#888'});
@ -431,7 +431,7 @@ FeedList.prototype.make_head = function() {
); );
if(has_common(user_roles, ['System Manager','Accounts Manager'])) { if(has_common(user_roles, ['System Manager','Accounts Manager'])) {
$btn(this.head, 'Dashboard', function() {loadpage('dashboard'); }, {marginLeft:'7px'}) $btn(this.head, 'Dashboard', function() {loadpage('dashboard'); }, {marginLeft:'7px'}, 'cupid-blue')
} }
} }

2
index.html
View File

File diff suppressed because one or more lines are too long

3
js/app.js
View File

@ -1,6 +1,7 @@
wn.settings.no_history = true; wn.settings.no_history = true;
wn.require('lib/js/lib/jquery.min.js'); wn.require('lib/js/lib/jquery.min.js');
wn.require('lib/js/legacy/tiny_mce_33/jquery.tinymce.js');
wn.require('lib/js/wn/ui/status_bar.js'); wn.require('lib/js/wn/ui/status_bar.js');
wn.sb = new wn.ui.StatusBar(); wn.sb = new wn.ui.StatusBar();
@ -12,8 +13,6 @@ wn.sb.set_value(25);
wn.require('lib/js/legacy/wnf.compressed.js'); wn.require('lib/js/legacy/wnf.compressed.js');
wn.sb.set_value(60); wn.sb.set_value(60);
wn.require('lib/js/legacy/form.compressed.js');
wn.require('lib/js/legacy/report.compressed.js');
wn.require('lib/css/legacy/default.css'); wn.require('lib/css/legacy/default.css');
wn.sb.set_value(80); wn.sb.set_value(80);

3
todo.md
View File

@ -4,12 +4,13 @@ x loading bar
x blank.html issues x blank.html issues
x double (init) loading issue x double (init) loading issue
x redirect (sid) issue x redirect (sid) issue
x new buttons
x tinymce issues
- release - release
- breakup - form - breakup - form
- breakup - report - breakup - report
- new buttons
- use wn.require to load forms, reports - use wn.require to load forms, reports
- use wn.xmlhttp - use wn.xmlhttp
- try and breakup wnframework - try and breakup wnframework