Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
diff --git a/css/all-app.css b/css/all-app.css
index a773232..790887e 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -1568,8 +1568,8 @@
.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 4e47b16..ea41c4f 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -263,7 +263,7 @@
</div>\
\
<div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
- <div class="list-toolbar" style="float: left">\
+ <div class="list-toolbar btn-group" style="display:inline-block;">\
<a class="btn btn-small btn-refresh btn-info">\
<i class="icon-refresh icon-white"></i> Refresh</a>\
<a class="btn btn-small btn-new">\
@@ -271,8 +271,9 @@
<a class="btn btn-small btn-filter">\
<i class="icon-search"></i> Filter</a>\
</div>\
- <img src="lib/images/ui/button-load.gif" \
- class="img-load" style="float: left"/>\
+ <div style="display:inline-block; width: 24px; margin-left: 4px">\
+ <img src="lib/images/ui/button-load.gif" \
+ class="img-load"/></div>\
</div><div style="clear:both"></div>\
\
<div class="no-result help hide">\
@@ -292,7 +293,7 @@
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 a1e0424..34d4b6d 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -177,7 +177,7 @@
</div>\
\
<div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
- <div class="list-toolbar" style="float: left">\
+ <div class="list-toolbar btn-group" style="display:inline-block;">\
<a class="btn btn-small btn-refresh btn-info">\
<i class="icon-refresh icon-white"></i> Refresh</a>\
<a class="btn btn-small btn-new">\
@@ -185,8 +185,9 @@
<a class="btn btn-small btn-filter">\
<i class="icon-search"></i> Filter</a>\
</div>\
- <img src="lib/images/ui/button-load.gif" \
- class="img-load" style="float: left"/>\
+ <div style="display:inline-block; width: 24px; margin-left: 4px">\
+ <img src="lib/images/ui/button-load.gif" \
+ class="img-load"/></div>\
</div><div style="clear:both"></div>\
\
<div class="no-result help hide">\
@@ -206,7 +207,7 @@
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 @@
</div>\
\
<div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
- <div class="list-toolbar" style="float: left">\
+ <div class="list-toolbar btn-group" style="display:inline-block;">\
<a class="btn btn-small btn-refresh btn-info">\
<i class="icon-refresh icon-white"></i> Refresh</a>\
<a class="btn btn-small btn-new">\
@@ -908,8 +909,9 @@
<a class="btn btn-small btn-filter">\
<i class="icon-search"></i> Filter</a>\
</div>\
- <img src="lib/images/ui/button-load.gif" \
- class="img-load" style="float: left"/>\
+ <div style="display:inline-block; width: 24px; margin-left: 4px">\
+ <img src="lib/images/ui/button-load.gif" \
+ class="img-load"/></div>\
</div><div style="clear:both"></div>\
\
<div class="no-result help hide">\
@@ -929,7 +931,7 @@
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 4422c3e..0bfd226 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1355
+1386
\ No newline at end of file