From 40ee8d64328870df33bcbdbec67d1f6fb7f93fd2 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 24 Feb 2012 19:21:47 +0530 Subject: [PATCH 1/2] UI fixes in support ticket and desktop --- css/all-app.css | 26 +++++++++++++++---- css/all-web.css | 25 ++++++++++++++---- erpnext/home/page/desktop/desktop.css | 8 +++--- erpnext/patches/jan_mar_2012/navupdate.py | 3 +++ .../doctype/support_ticket/support_ticket.js | 8 +++--- js/all-app.js | 12 ++++----- js/all-web.js | 12 ++++----- version.num | 2 +- 8 files changed, 62 insertions(+), 34 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index f457e960c7..e241ec9408 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -168,9 +168,9 @@ div.std-footer-item { } .layout_wrapper, .layout-wrapper { - -moz-box-shadow: 1px 1px 6px #AAA; - -webkit-box-shadow: 1px 1px 6px #AAA; - box-shadow: 1px 1px 6px #AAA; + -moz-box-shadow: 1px 1px 8px #555; + -webkit-box-shadow: 1px 1px 8px #555; + box-shadow: 1px 1px 8px #555; background-color: #fff; padding: 15px; } @@ -181,7 +181,7 @@ div.std-footer-item { } .layout-main-section { - width: 70%; + width: 71%; float: left; padding: 15px; background-color: #FFF; @@ -190,7 +190,7 @@ div.std-footer-item { .layout-side-section { width: 22%; - float: right; + /*float: right;*/ color: #606060; overflow-x: hidden; padding: 15px; @@ -212,6 +212,21 @@ div.std-footer-item { clear: both; } +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #eee; + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} + /* * lib/css/legacy/menus.css */ @@ -1168,6 +1183,7 @@ div.psidebar div.section-item, div.psidebar .section-link { font-size: 11px; color: #666; } + /* * lib/css/bootstrap/headings.css *//* heading from bootstrap */ diff --git a/css/all-web.css b/css/all-web.css index aec9880313..db235f8da5 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -168,9 +168,9 @@ div.std-footer-item { } .layout_wrapper, .layout-wrapper { - -moz-box-shadow: 1px 1px 6px #AAA; - -webkit-box-shadow: 1px 1px 6px #AAA; - box-shadow: 1px 1px 6px #AAA; + -moz-box-shadow: 1px 1px 8px #555; + -webkit-box-shadow: 1px 1px 8px #555; + box-shadow: 1px 1px 8px #555; background-color: #fff; padding: 15px; } @@ -181,7 +181,7 @@ div.std-footer-item { } .layout-main-section { - width: 70%; + width: 71%; float: left; padding: 15px; background-color: #FFF; @@ -190,7 +190,7 @@ div.std-footer-item { .layout-side-section { width: 22%; - float: right; + /*float: right;*/ color: #606060; overflow-x: hidden; padding: 15px; @@ -212,6 +212,21 @@ div.std-footer-item { clear: both; } +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #eee; + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} + /* * lib/css/legacy/menus.css */ diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css index bc67739961..01e2ea54e9 100644 --- a/erpnext/home/page/desktop/desktop.css +++ b/erpnext/home/page/desktop/desktop.css @@ -1,6 +1,6 @@ /* Sprite CSS */ .sprite-account{ background-position: 0 0; width: 32px; height: 40px; } -.sprite-selling{ background-position: 0 -90px; width: 40px; height: 40px; } +.sprite-buying{ background-position: 0 -90px; width: 40px; height: 40px; } .sprite-calendar{ background-position: 0 -180px; width: 35px; height: 40px; } .sprite-dashboard{ background-position: 0 -270px; width: 40px; height: 29px; } .sprite-feed{ background-position: 0 -349px; width: 32px; height: 40px; } @@ -10,7 +10,7 @@ .sprite-production{ background-position: 0 -686px; width: 40px; height: 33px; } .sprite-project{ background-position: 0 -769px; width: 40px; height: 22px; } .sprite-report{ background-position: 0 -841px; width: 29px; height: 40px; } -.sprite-buying{ background-position: 0 -931px; width: 34px; height: 40px; } +.sprite-selling{ background-position: 0 -931px; width: 34px; height: 40px; } .sprite-setting{ background-position: 0 -1021px; width: 37px; height: 40px; } .sprite-stock{ background-position: 0 -1111px; width: 34px; height: 39px; } .sprite-support{ background-position: 0 -1200px; width: 40px; height: 40px; } @@ -21,9 +21,9 @@ .sprite-account{ margin-top: 8px; margin-left: 12px; } -.sprite-selling{ margin-top: 8px; margin-left: 8px; } +.sprite-selling{ margin-top: 8px; margin-left: 12px; } .sprite-stock{ margin-top: 8px; margin-left: 8px; } -.sprite-buying{ margin-top: 8px; margin-left: 12px; } +.sprite-buying{ margin-top: 8px; margin-left: 8px; } .sprite-support{ margin-top: 8px; margin-left: 8px; } .sprite-hr{ margin-top: 12px; margin-left: 8px; } .sprite-project{ margin-top: 16px; margin-left: 8px; } diff --git a/erpnext/patches/jan_mar_2012/navupdate.py b/erpnext/patches/jan_mar_2012/navupdate.py index c6c4af22a8..44942d9584 100644 --- a/erpnext/patches/jan_mar_2012/navupdate.py +++ b/erpnext/patches/jan_mar_2012/navupdate.py @@ -32,6 +32,9 @@ def execute(): reload_doc('utilities', 'page', 'todo') reload_doc('utilities', 'page', 'calendar') + webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page', + 'desktop') + webnotes.conn.commit() try: diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js index b21480b04b..02c9a5d082 100644 --- a/erpnext/support/doctype/support_ticket/support_ticket.js +++ b/erpnext/support/doctype/support_ticket/support_ticket.js @@ -159,13 +159,11 @@ EmailMessage = function(parent, args, list, idx) { this.from_email = this.from_email.replace('<', '<').replace('>', '>'); // main wrapper - w = $a(parent, 'div', '', - {margin:'7px 0px', padding:'0px', border:'1px solid #c8c8c8', backgroundColor:'#f9f9f9'} - ); - $br(w, '7px'); + w = $a(parent, 'div', 'support-ticket-wrapper well'); + //$(w).addClass('support-ticket-wrapper'); // sender and timestamp - $a($a(w, 'div', '', {marginBottom:'7px', padding: '7px', backgroundColor:'#d2d2f2'}), + $a($a(w, 'div', 'support-ticket-title'), 'span', 'link_type', {}, repl('By %(from_email)s on %(creation)s:', this), function() { // toggle message display on timestamp diff --git a/js/all-app.js b/js/all-app.js index caf98b3d80..4618dad270 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -211,8 +211,7 @@ wn.versions.check();$(document).bind('ready',function(){var base=window.location * lib/js/legacy/globals.js */ wn.provide('wn.widgets.form');wn.provide('wn.widgets.report');wn.provide('wn.utils');wn.provide('wn.model');wn.provide('wn.profile');wn.provide('wn.session');wn.provide('_f');wn.provide('_p');wn.provide('_r');wn.provide('_c');wn.provide('_e');wn.provide('_startup_data') -wn.settings.no_history=1;var NEWLINE='\n';var login_file='';var version='v170';var profile=null;var session={};var is_testing=false;var user=null;var user_defaults=null;var user_roles=null;var user_fullname=null;var user_email=null;var user_img={};var home_page=null;var hide_autosuggest=null;var page_body=null;var pscript={};var selector=null;var top_index=91;var _f={};var _p={};var _e={};var _r={};var FILTER_SEP='\1';var _c={};var widget_files={'_f.FrmContainer':'form.compressed.js','_c.CalendarPopup':'widgets/form/date_picker.js','_r.ReportContainer':'report.compressed.js','_p.PrintQuery':'widgets/print_query.js','Calendar':'widgets/calendar.js','Recommendation':'widgets/recommend.js','RatingWidget':'widgets/rating.js'} -var frms={};var cur_frm=null;var pscript={};var validated=true;var validation_message='';var tinymce_loaded=null;var cur_autosug=null; +wn.settings.no_history=1;var NEWLINE='\n';var login_file='';var version='v170';var profile=null;var session={};var is_testing=false;var user=null;var user_defaults=null;var user_roles=null;var user_fullname=null;var user_email=null;var user_img={};var home_page=null;var hide_autosuggest=null;var page_body=null;var pscript={};var selector=null;var top_index=91;var _f={};var _p={};var _e={};var _r={};var FILTER_SEP='\1';var frms={};var cur_frm=null;var pscript={};var validated=true;var validation_message='';var tinymce_loaded=null;var cur_autosug=null; /* * lib/js/legacy/utils/datatype.js */ @@ -855,7 +854,8 @@ Listing.prototype.std_cell=function(cell,ri,ci,d){var has_headrow=this.colnames? */ wn.widgets.Listing=function(opts){this.opts=opts;this.page_length=20;this.btns={};this.start=0;var me=this;this.make=function(opts){this.wrapper=$a(this.opts.parent,'div');this.filters_area=$a(this.wrapper,'div','listing-filters');this.toolbar_area=$a(this.wrapper,'div','listing-toolbar');this.results_area=$a(this.wrapper,'div','listing-results');this.more_button_area=$a(this.wrapper,'div','listing-more');this.no_results_area=$a(this.wrapper,'div','help_box',{display:'none'},(this.opts.no_result_message?this.opts.no_result_message:'No results'));if(opts)this.opts=opts;this.page_length=this.opts.page_length?this.opts.page_length:this.page_length;this.make_toolbar();this.make_filters();this.make_more_button();} this.make_filters=function(){if(this.opts.filters){$ds(this.filters_area);this.filters=new wn.widgets.FieldGroup(this.filters_area,this.opts.fields);}} -this.make_toolbar=function(){if(!(this.opts.hide_refresh||this.opts.no_refresh)){this.ref_img=$a(this.toolbar_area,'span','link_type',{color:'#888'},'[refresh]');this.ref_img.onclick=function(){me.run();} +this.make_toolbar=function(){if(!(this.opts.hide_refresh||this.opts.no_refresh)){if(this.opts.title){$a(this.toolbar_area,'h3','',{display:'inline-block',marginRight:'15px'},this.opts.title);} +this.ref_img=$a(this.toolbar_area,'span','link_type',{color:'#888'},'[refresh]');this.ref_img.onclick=function(){me.run();} this.loading_img=$a(this.toolbar_area,'img','lib/images/ui/button-load.gif',{display:'none',marginLeft:'3px',marginBottom:'-2px'});} if(this.opts.new_doctype){this.new_btn=$btn(this.toolbar_area,'New '+get_doctype_label(this.opts.new_doctype),function(){newdoc(me.opts.new_doctype,me.opts.new_doc_onload,me.opts.new_doc_indialog,me.opts.new_doc_onsave);},{marginLeft:'7px'});}} this.make_more_button=function(){this.more_btn=$btn(this.more_button_area,'More...',function(){me.more_btn.set_working();me.run(function(){me.more_btn.done_working();},1);},'',0,1);$y(this.more_btn.loading_img,{marginBottom:'0px'});} @@ -1206,8 +1206,7 @@ function get_local(dt,dn){return locals[dt]?locals[dt][dn]:null;} LocalDB.sync=function(list){if(list._kl)list=expand_doclist(list);for(var i=0;i Date: Fri, 24 Feb 2012 19:35:09 +0530 Subject: [PATCH 2/2] added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background --- css/all-app.css | 5 ----- css/all-web.css | 5 ----- erpnext/startup/startup.css | 5 ----- erpnext/startup/startup.js | 2 +- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 7 files changed, 4 insertions(+), 19 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index e241ec9408..ca0f6a76c6 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -2816,14 +2816,9 @@ body { .erpnext-footer { margin: 3px auto; - color: #888; text-align: center; } -.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited { - color: #666; -} - .module-icons { background: url(../images/module-icons.png) no-repeat top left; width:16px; diff --git a/css/all-web.css b/css/all-web.css index db235f8da5..0ac96aada2 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1623,14 +1623,9 @@ body { .erpnext-footer { margin: 3px auto; - color: #888; text-align: center; } -.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited { - color: #666; -} - .module-icons { background: url(../images/module-icons.png) no-repeat top left; width:16px; diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index f7e6304ca0..6410ccc74d 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -17,14 +17,9 @@ body { .erpnext-footer { margin: 3px auto; - color: #888; text-align: center; } -.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited { - color: #666; -} - .module-icons { background: url(../images/module-icons.png) no-repeat top left; width:16px; diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index ed71aa19ba..bf69aa7e3c 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -48,7 +48,7 @@ erpnext.startup.start = function() { // border to the body // ------------------ - $('footer').html('
\ + $('footer').html('
\ Powered by ERPNext
'); } diff --git a/js/all-app.js b/js/all-app.js index 4618dad270..911938a1c8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2210,7 +2210,7 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f var current_module;var is_system_manager=0;var module_content_dict={};var user_full_nm={};wn.provide('erpnext.startup');erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway) if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ Powered by ERPNext
');} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} diff --git a/js/all-web.js b/js/all-web.js index 0d45a497fb..7ab7df3655 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1045,7 +1045,7 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f var current_module;var is_system_manager=0;var module_content_dict={};var user_full_nm={};wn.provide('erpnext.startup');erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway) if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ Powered by ERPNext
');} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} diff --git a/version.num b/version.num index 679fa6b429..8d75cc7df7 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -698 +705 \ No newline at end of file