From 6dde93d5f0f521661ed5d05b72528bcf79f5039b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 14:18:47 +0530 Subject: [PATCH] fix to brand_html --- js/all-app.js | 2 +- js/all-web.js | 2 +- js/app.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 1d0ac8590d3..3c5bd22bd87 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2219,7 +2219,7 @@ $(favicon).appendTo('head');}}) * js/app.js */ wn.provide('erpnext');erpnext.set_about=function(){wn.provide('wn.app');$.extend(wn.app,{name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2'});} -wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html(wn.boot.website_settings.brand_html.substr(0,15)||'erpnext'+' ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); +wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html((wn.boot.website_settings.brand_html||'erpnext')+' ').css('max-width','200px').css('overflow','hidden').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); /* * erpnext/startup/startup.js */ diff --git a/js/all-web.js b/js/all-web.js index 016d1a7b04a..e6907bf331c 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -830,7 +830,7 @@ $(favicon).appendTo('head');}}) * js/app.js */ wn.provide('erpnext');erpnext.set_about=function(){wn.provide('wn.app');$.extend(wn.app,{name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2'});} -wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html(wn.boot.website_settings.brand_html.substr(0,15)||'erpnext'+' ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); +wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html((wn.boot.website_settings.brand_html||'erpnext')+' ').css('max-width','200px').css('overflow','hidden').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); /* * erpnext/startup/startup.js */ diff --git a/js/app.js b/js/app.js index fcacec28fa3..80efaf6a38c 100644 --- a/js/app.js +++ b/js/app.js @@ -14,8 +14,9 @@ erpnext.set_about = function() { wn.modules_path = 'erpnext'; $(document).bind('toolbar_setup', function() { - $('.brand').html(wn.boot.website_settings.brand_html.substr(0,15) || 'erpnext' + + $('.brand').html((wn.boot.website_settings.brand_html || 'erpnext') + ' ') + .css('max-width', '200px').css('overflow', 'hidden') .hover(function() { $(this).find('.icon-home').addClass('navbar-icon-home-hover'); }, function() {