fixes to buttons etc
This commit is contained in:
parent
8cf45175a7
commit
5caedffff8
File diff suppressed because one or more lines are too long
@ -1,11 +1,11 @@
|
||||
pscript.onload_dashboard = function() {
|
||||
// load jqplot
|
||||
$.scriptPath = 'js/'
|
||||
$.require(['jquery/jquery.jqplot.min.js',
|
||||
'jquery/jqplot-plugins/jqplot.barRenderer.js',
|
||||
'jquery/jqplot-plugins/jqplot.canvasAxisTickRenderer.min.js',
|
||||
'jquery/jqplot-plugins/jqplot.canvasTextRenderer.min.js',
|
||||
'jquery/jqplot-plugins/jqplot.categoryAxisRenderer.min.js']);
|
||||
wn.require('lib/js/legacy/jquery/jquery.jqplot.min.js');
|
||||
wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.barRenderer.js');
|
||||
wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.canvasAxisTickRenderer.min.js');
|
||||
wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.canvasTextRenderer.min.js');
|
||||
wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.categoryAxisRenderer.min.js');
|
||||
|
||||
|
||||
pscript.dashboard_settings = {
|
||||
|
@ -123,7 +123,7 @@ HomeWidget = function(parent, heading, item) {
|
||||
this.footer = $a(this.wrapper,'div');
|
||||
|
||||
// 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
|
||||
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'])) {
|
||||
$btn(this.head, 'Dashboard', function() {loadpage('dashboard'); }, {marginLeft:'7px'})
|
||||
$btn(this.head, 'Dashboard', function() {loadpage('dashboard'); }, {marginLeft:'7px'}, 'cupid-blue')
|
||||
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
@ -1,6 +1,7 @@
|
||||
wn.settings.no_history = true;
|
||||
|
||||
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.sb = new wn.ui.StatusBar();
|
||||
@ -12,8 +13,6 @@ wn.sb.set_value(25);
|
||||
wn.require('lib/js/legacy/wnf.compressed.js');
|
||||
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.sb.set_value(80);
|
||||
|
||||
|
3
todo.md
3
todo.md
@ -4,12 +4,13 @@ x loading bar
|
||||
x blank.html issues
|
||||
x double (init) loading issue
|
||||
x redirect (sid) issue
|
||||
x new buttons
|
||||
x tinymce issues
|
||||
|
||||
- release
|
||||
|
||||
- breakup - form
|
||||
- breakup - report
|
||||
- new buttons
|
||||
- use wn.require to load forms, reports
|
||||
- use wn.xmlhttp
|
||||
- try and breakup wnframework
|
Loading…
Reference in New Issue
Block a user