From 0e140962b8e2272957ea9a86fb1269514d20e159 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 1 Mar 2012 12:16:02 +0530 Subject: [PATCH] Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults --- css/all-app.css | 2 +- css/all-web.css | 2 +- erpnext/home/page/desktop/desktop.css | 13 +++++++++++++ erpnext/home/page/desktop/desktop.js | 12 ++++++------ .../setup/doctype/setup_control/setup_control.py | 13 ++++++++++--- .../doctype/support_ticket/support_ticket.js | 3 ++- version.num | 2 +- 7 files changed, 34 insertions(+), 13 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index b2fd2e5732b..b49caedee90 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1043,7 +1043,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; diff --git a/css/all-web.css b/css/all-web.css index 9359de898e8..bebfe9a3347 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -362,7 +362,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css index 0aede60c67b..836469c14eb 100644 --- a/erpnext/home/page/desktop/desktop.css +++ b/erpnext/home/page/desktop/desktop.css @@ -41,10 +41,15 @@ .case-border { border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; width: 56px; height: 56px; border: 4px solid white; box-shadow: 0 0 10px 1px black; + -moz-box-shadow: 0 0 10px 1px black; + -webkit-box-shadow: 0 0 10px 1px black; + -o-box-shadow: 0 0 10px 1px black; margin: auto; } @@ -66,6 +71,9 @@ /* Hover and click effects */ .case-border:hover, .circle:hover { box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; + -moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; + -webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; + -o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; } .case-border:active, .case-border:focus, .circle:active, .circle:focus { @@ -78,6 +86,8 @@ .circle { border-radius: 100%; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; height: 15px; min-width: 15px; background: #B00D07; @@ -88,6 +98,9 @@ margin-right: 10px; border: 2px solid white; box-shadow: 0 0 10px 1px black; + -moz-box-shadow: 0 0 10px 1px black; + -webkit-box-shadow: 0 0 10px 1px black; + -o-box-shadow: 0 0 10px 1px black; } .circle-text { diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js index 47b11e6f9e4..dab1e761b0d 100644 --- a/erpnext/home/page/desktop/desktop.js +++ b/erpnext/home/page/desktop/desktop.js @@ -3,12 +3,12 @@ wn.provide('erpnext.desktop'); erpnext.desktop.gradient = "" diff --git a/erpnext/setup/doctype/setup_control/setup_control.py b/erpnext/setup/doctype/setup_control/setup_control.py index 6b8b37c2361..50b9bb03cb4 100644 --- a/erpnext/setup/doctype/setup_control/setup_control.py +++ b/erpnext/setup/doctype/setup_control/setup_control.py @@ -69,7 +69,7 @@ class DocType: import webnotes, json args = json.loads(args) - curr_fiscal_year, fy_start_date = self.get_fy_details(args.get('fy_start')) + curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start')) args['name'] = webnotes.session.get('user') @@ -82,7 +82,12 @@ class DocType: # Fiscal Year - master_dict = {'Fiscal Year':{'year':curr_fiscal_year, 'year_start_date':fy_start_date}} + master_dict = {'Fiscal Year':{ + 'year': curr_fiscal_year, + 'year_start_date': fy_start_date, + 'abbreviation': fy_abbr, + 'company': args.get('company_name'), + 'is_fiscal_year_closed': 'No'}} self.create_records(master_dict) # Company @@ -163,9 +168,11 @@ class DocType: #eddt = sql("select DATE_FORMAT(DATE_SUB(DATE_ADD('%s', INTERVAL 1 YEAR), INTERVAL 1 DAY),'%%d-%%m-%%Y')" % (stdt.split('-')[2]+ '-' + stdt.split('-')[1] + '-' + stdt.split('-')[0])) if(fy_start == '1st Jan'): fy = cstr(getdate(nowdate()).year) + abbr = cstr(fy)[-2:] else: fy = cstr(curr_year) + '-' + cstr(curr_year+1) - return fy,stdt + abbr = cstr(curr_year)[-2:] + '-' + cstr(curr_year+1)[-2:] + return fy, stdt, abbr # Create Company and Fiscal Year diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js index 02c9a5d0823..86264a64339 100644 --- a/erpnext/support/doctype/support_ticket/support_ticket.js +++ b/erpnext/support/doctype/support_ticket/support_ticket.js @@ -178,7 +178,8 @@ EmailMessage = function(parent, args, list, idx) { // email text this.message = $a(w, 'div', '', // style - {lineHeight:'1.7em', display:'none', padding: '7px'}, + {lineHeight:'1.7em', display:'none', padding: '7px', width: '575px', + wordWrap: 'break-word', textWrap: 'normal', overflowX: 'auto'}, // newlines for text email (this.content_type=='text/plain' ? this.mail diff --git a/version.num b/version.num index 19e03cffa38..699ec1b9ee9 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -776 \ No newline at end of file +781 \ No newline at end of file