From d5e1031f428e9834804ea3593756af1f84001149 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 May 2012 17:44:59 +0530 Subject: [PATCH] floating logo on left --- css/all-app.css | 14 +++++++++++- css/all-web.css | 14 +++++++++++- .../period_closing_voucher.js | 4 ---- .../period_closing_voucher.txt | 11 --------- erpnext/startup/startup.js | 21 ++++-------------- erpnext/website/js/topbar.js | 2 -- images/erpnext-fade.png | Bin 0 -> 516 bytes js/all-app.js | 10 +++------ js/all-web.js | 12 +++------- 9 files changed, 36 insertions(+), 52 deletions(-) create mode 100644 images/erpnext-fade.png diff --git a/css/all-app.css b/css/all-app.css index 52ec6823b6..8d825a2c11 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1961,7 +1961,7 @@ footer { color: inherit; padding: 10px; font-size: 12px; - line-height: 1.7; + line-height: 1.7; } span, div, td, input, textarea, button, select { @@ -2222,11 +2222,23 @@ div.std-footer-item { vertical-align: middle; overflow: hidden; margin: 0px 3px; + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; } .avatar-small img { width: 24px; } +.erpnext-logo { + position: fixed; + bottom: 5px; + left: 5px; + height: 40px; + width: 40px; + background: url('../images/erpnext-fade.png') no-repeat top left; +} + /* * lib/css/legacy/messages.css */ diff --git a/css/all-web.css b/css/all-web.css index 8f9003c8b1..8b360ba11f 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1822,7 +1822,7 @@ footer { color: inherit; padding: 10px; font-size: 12px; - line-height: 1.7; + line-height: 1.7; } span, div, td, input, textarea, button, select { @@ -2083,11 +2083,23 @@ div.std-footer-item { vertical-align: middle; overflow: hidden; margin: 0px 3px; + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; } .avatar-small img { width: 24px; } +.erpnext-logo { + position: fixed; + bottom: 5px; + left: 5px; + height: 40px; + width: 40px; + background: url('../images/erpnext-fade.png') no-repeat top left; +} + /* * lib/css/legacy/messages.css */ diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js index 4179ed0344..c4288a40b5 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js @@ -36,7 +36,3 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.fields_dict['closing_account_head'].get_query = function(doc, cdt, cdn) { return 'SELECT `tabAccount`.name FROM `tabAccount` WHERE `tabAccount`.is_pl_account = "No" AND `tabAccount`.debit_or_credit = "Credit" AND `tabAccount`.company = "'+ cstr(doc.company) +'" AND `tabAccount`.freeze_account = "No" AND `tabAccount`.group_or_ledger = "Ledger" AND `tabAccount`.%(key)s LIKE "%s" ORDER BY `tabAccount`.name ASC LIMIT 50'; } - -cur_frm.cscript.acc_help = function(doc,dt,dn){ - show_chart_browser('Accounts Browser','Account'); -} diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt index 54e458e7ca..1f7efb571d 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt @@ -238,17 +238,6 @@ 'trigger': u'Client' }, - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'coa_help', - 'fieldtype': u'HTML', - 'label': u'CoA Help', - 'oldfieldtype': u'HTML', - 'options': u'To create Account Head, click here', - 'permlevel': 0 - }, - # DocField { 'doctype': u'DocField', diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 959c8540fe..b86116a679 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -112,26 +112,13 @@ erpnext.startup.start = function() { erpnext.set_about(); if(wn.control_panel.custom_startup_code) eval(wn.control_panel.custom_startup_code); -} - -// chart of accounts -// ==================================================================== -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); - } - else if(nm == 'Accounts Browser') - pscript.make_chart(chart_type); - } - loadpage(nm,call_back); + + $('body').append('') } // ========== Update Messages ============ -var update_messages = function(reset) { +erpnext.update_messages = function(reset) { // Updates Team Messages if(inList(['Guest'], user) || !wn.session_alive) { return; } @@ -183,7 +170,7 @@ erpnext.startup.set_periodic_updates = function() { clearInterval(wn.updates.id); } - wn.updates.id = setInterval(update_messages, 60000); + wn.updates.id = setInterval(erpnext.update_messages, 60000); } erpnext.set_user_background = function(src) { diff --git a/erpnext/website/js/topbar.js b/erpnext/website/js/topbar.js index a76d4efaf3..a600934a88 100644 --- a/erpnext/website/js/topbar.js +++ b/erpnext/website/js/topbar.js @@ -97,8 +97,6 @@ erpnext.Footer = Class.extend({ $('footer').html(repl('
\
    \
    © %(copyright)s
    \ -
    Powered by \ - erpnext.com
    \
    ', wn.boot.website_settings)); this.make_items(); }, diff --git a/images/erpnext-fade.png b/images/erpnext-fade.png new file mode 100644 index 0000000000000000000000000000000000000000..81cc41036a838e7857ff2c34635c660183670ff6 GIT binary patch literal 516 zcmV+f0{i`mP)Oc*c1{Mi^oOQ)rve;+JGuE}t`52mK&Hwk_V*iQ?bC6|S9?I(z5)-$-u#*CP{**wdFOnI9HLt64( zqjmzFKpTOgz&heD1hOqaTDGM;tx04p3x~icQK+foC*XiM9hLKDne#rB%fb?Ig31~g zuO@QZeF=o^=vmpzPK?37P1d;pZU^;}R8m{=z~15_O_p7t8+A_LzYxfN zq2*~A)w}}DMtwtk1gUn>NTvgDM+$z)y#~3z{C(P&00RJSLu@Zsc3CI@0000has expired. \ ',{expiry_string:expiry_string}));}}} erpnext.set_about();if(wn.control_panel.custom_startup_code) -eval(wn.control_panel.custom_startup_code);} -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);} -else if(nm=='Accounts Browser') -pscript.make_chart(chart_type);} -loadpage(nm,call_back);} -var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} +eval(wn.control_panel.custom_startup_code);$('body').append('')} +erpnext.update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} if(!reset){var set_messages=function(r){if(!r.exc){erpnext.toolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}} wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{erpnext.toolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} -wn.updates.id=setInterval(update_messages,60000);} +wn.updates.id=setInterval(erpnext.update_messages,60000);} erpnext.set_user_background=function(src){set_style(repl('#body_div { background: url("files/%(src)s") repeat;}',{src:src}))} $(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();} wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();} diff --git a/js/all-web.js b/js/all-web.js index 7ea4012597..ae63769f5d 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -852,17 +852,13 @@ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil. This ERPNext subscription has expired. \ ',{expiry_string:expiry_string}));}}} erpnext.set_about();if(wn.control_panel.custom_startup_code) -eval(wn.control_panel.custom_startup_code);} -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);} -else if(nm=='Accounts Browser') -pscript.make_chart(chart_type);} -loadpage(nm,call_back);} -var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} +eval(wn.control_panel.custom_startup_code);$('body').append('')} +erpnext.update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} if(!reset){var set_messages=function(r){if(!r.exc){erpnext.toolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}} wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{erpnext.toolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} -wn.updates.id=setInterval(update_messages,60000);} +wn.updates.id=setInterval(erpnext.update_messages,60000);} erpnext.set_user_background=function(src){set_style(repl('#body_div { background: url("files/%(src)s") repeat;}',{src:src}))} $(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();} wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();} @@ -892,8 +888,6 @@ if(!wn.boot.website_settings.address){wn.boot.website_settings.address='';} $('footer').html(repl('
    \
      \
      © %(copyright)s
      \ -
      Powered by \ - erpnext.com
      \
      ',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus for(var i=0;i%(label)s',item))}}}});erpnext.header_link_settings=function(item){item.route=item.url||item.custom_page;if(item.route&&item.route.substr(0,4)=='http'){item.target='target="_blank"';}else{item.target='';item.route='#!'+item.route;}}