From 842f7822530718cb95294a3e38a6056c3d3ba798 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 22 Mar 2012 14:24:49 +0530 Subject: [PATCH] listing - ajax icon --- css/all-app.css | 4 ++-- js/all-app.js | 9 +++++---- js/all-web.js | 18 ++++++++++-------- version.num | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index a7732322a6..790887eacc 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1568,8 +1568,8 @@ div.psidebar div.section-item, div.psidebar .section-link { .wnlist .img-load { display: none; - margin-left: 11px; - margin-top: 8px; + float: left; + margin-bottom: 8px; } /* list-row */ diff --git a/js/all-app.js b/js/all-app.js index 4e47b160a3..ea41c4fbf7 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -263,7 +263,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ \ \
\ -
\ +
\ \ Refresh\ \ @@ -271,8 +271,9 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ \ Filter\
\ - \ +
\ +
\
\ \
\ @@ -292,7 +293,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();} if(!me.show_filters){this.$w.find('.btn-filter').remove();} if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();} -this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){this.$w.find('.list-toolbar').addClass('btn-group')} +this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){var w=0;this.$w.find('.list-toolbar a').each(function(i,e){w+=$(this).outerWidth();});this.$w.find('.list-toolbar').css('width',(w+10)+'px');} if(nbtns==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function') this.onrun=a0;if(a0&&a0.callback) this.onrun=a0.callback;if(!a1&&!(a0&&a0.append)) diff --git a/js/all-web.js b/js/all-web.js index a1e0424825..34d4b6d3c1 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -177,7 +177,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
\ \
\ -
\ +
\ \ Refresh\ \ @@ -185,8 +185,9 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ \ Filter\
\ - \ +
\ +
\
\ \
\ @@ -206,7 +207,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();} if(!me.show_filters){this.$w.find('.btn-filter').remove();} if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();} -this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){this.$w.find('.list-toolbar').addClass('btn-group')} +this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){var w=0;this.$w.find('.list-toolbar a').each(function(i,e){w+=$(this).outerWidth();});this.$w.find('.list-toolbar').css('width',(w+10)+'px');} if(nbtns==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function') this.onrun=a0;if(a0&&a0.callback) this.onrun=a0.callback;if(!a1&&!(a0&&a0.append)) @@ -900,7 +901,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
\ \
\ -
\ +
\ \ Refresh\ \ @@ -908,8 +909,9 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ \ Filter\
\ - \ +
\ +
\
\ \
\ @@ -929,7 +931,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();} if(!me.show_filters){this.$w.find('.btn-filter').remove();} if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();} -this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){this.$w.find('.list-toolbar').addClass('btn-group')} +this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){var w=0;this.$w.find('.list-toolbar a').each(function(i,e){w+=$(this).outerWidth();});this.$w.find('.list-toolbar').css('width',(w+10)+'px');} if(nbtns==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function') this.onrun=a0;if(a0&&a0.callback) this.onrun=a0.callback;if(!a1&&!(a0&&a0.append)) diff --git a/version.num b/version.num index 4422c3ed26..0bfd2262b7 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1355 +1386 \ No newline at end of file