diff --git a/public/css/all-app.css b/public/css/all-app.css index 25dbbe8bfb..a7a8b3bb81 100644 --- a/public/css/all-app.css +++ b/public/css/all-app.css @@ -3675,6 +3675,7 @@ div.stat-label { position: relative; padding: 3px; text-align: center; + font-size: 11px; } div.stat-label, div.stat-label a { z-index: 5; @@ -3684,19 +3685,26 @@ div.stat-item { position: relative; margin-bottom: 7px; background-color: #fff; - height: 22px; + height: 18px; border: 2px solid #aaa; - border-radius: 11px; + border-radius: 9px; overflow: hidden; } div.stat-bar { position: absolute; left: 0px; - background-color: #DEF9A7; - border-radius: 11px 0px 0px 11px; height: 100%; z-index: 0; + + background: #e0ff84; /* Old browsers */ + background: -moz-linear-gradient(top, #e0ff84 0%, #a4e567 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e0ff84), color-stop(100%,#a4e567)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* IE10+ */ + background: linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0ff84', endColorstr='#a4e567',GradientType=0 ); /* IE6-9 */ } /* diff --git a/public/css/all-web.css b/public/css/all-web.css index f2327f2a1b..27f81dff14 100644 --- a/public/css/all-web.css +++ b/public/css/all-web.css @@ -2427,6 +2427,7 @@ div.stat-label { position: relative; padding: 3px; text-align: center; + font-size: 11px; } div.stat-label, div.stat-label a { z-index: 5; @@ -2436,19 +2437,26 @@ div.stat-item { position: relative; margin-bottom: 7px; background-color: #fff; - height: 22px; + height: 18px; border: 2px solid #aaa; - border-radius: 11px; + border-radius: 9px; overflow: hidden; } div.stat-bar { position: absolute; left: 0px; - background-color: #DEF9A7; - border-radius: 11px 0px 0px 11px; height: 100%; z-index: 0; + + background: #e0ff84; /* Old browsers */ + background: -moz-linear-gradient(top, #e0ff84 0%, #a4e567 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e0ff84), color-stop(100%,#a4e567)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* IE10+ */ + background: linear-gradient(top, #e0ff84 0%,#a4e567 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0ff84', endColorstr='#a4e567',GradientType=0 ); /* IE6-9 */ } /* diff --git a/public/js/all-app.js b/public/js/all-app.js index 439bd3cdfd..da03ffc087 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -1035,7 +1035,9 @@ wn.views.ReportView=wn.ui.Listing.extend({init:function(doctype,docname){var me= +' '+this.sort_order_select.val() if(this.sort_by_next_select.val()){order_by+=', '+this.get_full_column_name([this.sort_by_next_select.val()]) +' '+this.sort_order_next_select.val()} -return order_by;},get_full_column_name:function(v){return(v[1]?('`tab'+v[1]+'`'):this.tab_name)+'.'+v[0];},build_columns:function(){var me=this;return $.map(this.columns,function(c){return{id:c[0],field:c[0],name:(wn.meta.docfield_map[c[1]||me.doctype][c[0]]?wn.meta.docfield_map[c[1]||me.doctype][c[0]].label:toTitle(c[0])),width:120}});},render_list:function(){var columns=[{id:'_idx',field:'_idx',name:'Sr.',width:40}].concat(this.build_columns());$.each(this.data,function(i,v){v._idx=i+1;});var options={enableCellNavigation:true,enableColumnReorder:false};var grid=new Slick.Grid(this.$w.find('.result-list').css('border','1px solid grey').css('height','500px').get(0),this.data,columns,options);},make_column_picker:function(){var me=this;this.column_picker=new wn.ui.ColumnPicker(this);this.page.appframe.add_button('Pick Columns',function(){me.column_picker.show(me.columns);},'icon-th-list');},make_sorter:function(){var me=this;this.sort_dialog=new wn.ui.Dialog({title:'Sorting Preferences'});$(this.sort_dialog.body).html('

Sort By

\ +return order_by;},get_full_column_name:function(v){return(v[1]?('`tab'+v[1]+'`'):this.tab_name)+'.'+v[0];},build_columns:function(){var me=this;return $.map(this.columns,function(c){var docfield=wn.meta.docfield_map[c[1]||me.doctype][c[0]];coldef={id:c[0],field:c[0],docfield:docfield,name:(docfield?docfield.label:toTitle(c[0])),width:(docfield?cint(docfield.width):120)||120} +console.log(docfield&&docfield.width);if(c[0]=='name'){coldef.formatter=function(row,cell,value,columnDef,dataContext){return repl("%(name)s",{doctype:me.doctype,name:value});}}else if(docfield&&docfield.fieldtype=='Link'){coldef.formatter=function(row,cell,value,columnDef,dataContext){if(value){return repl("%(name)s",{doctype:columnDef.docfield.options,name:value});}else{return'';}}} +return coldef;});},render_list:function(){var me=this;var columns=[{id:'_idx',field:'_idx',name:'Sr.',width:40}].concat(this.build_columns());$.each(this.data,function(i,v){v._idx=i+1;});var options={enableCellNavigation:true,enableColumnReorder:false};var grid=new Slick.Grid(this.$w.find('.result-list').css('border','1px solid grey').css('height','500px').get(0),this.data,columns,options);},make_column_picker:function(){var me=this;this.column_picker=new wn.ui.ColumnPicker(this);this.page.appframe.add_button('Pick Columns',function(){me.column_picker.show(me.columns);},'icon-th-list');},make_sorter:function(){var me=this;this.sort_dialog=new wn.ui.Dialog({title:'Sorting Preferences'});$(this.sort_dialog.body).html('

Sort By

\
\