diff --git a/erpnext/website/doctype/style_settings/style_settings.py b/erpnext/website/doctype/style_settings/style_settings.py index db26a15e808..f47a427bae0 100644 --- a/erpnext/website/doctype/style_settings/style_settings.py +++ b/erpnext/website/doctype/style_settings/style_settings.py @@ -25,6 +25,9 @@ class DocType: with open('erpnext/website/doctype/style_settings/custom_template.css', 'r') as f: temp = Template(f.read()) + if not self.doc.font_size: + self.doc.font_size = '13px' + self.doc.small_font_size = str(int(self.doc.font_size[:-2])-2) + 'px' self.doc.custom_css = temp.render(doc = self.doc) diff --git a/erpnext/website/js/topbar.js b/erpnext/website/js/topbar.js index 8caf8dcf1ca..e6a6b59c4a7 100644 --- a/erpnext/website/js/topbar.js +++ b/erpnext/website/js/topbar.js @@ -27,7 +27,7 @@ wn.provide('erpnext.navbar'); erpnext.navbar.Navbar = Class.extend({ init: function() { this.make(); - $('.brand').html(wn.boot.website_settings.brand_html); + $('.brand').html(wn.boot.website_settings.brand_html || sys_defaults.company); this.make_items(); $('.dropdown-toggle').dropdown(); }, @@ -54,9 +54,11 @@ erpnext.navbar.Navbar = Class.extend({ for(var i=0;i\ - %(label)s', item)) + %(label)s', item)); } } @@ -77,18 +79,23 @@ erpnext.navbar.Navbar = Class.extend({ }); $parent_li.append(''); } - item.route = item.url || item.custom_page; + erpnext.header_link_settings(item); $parent_li.find('.dropdown-menu').append(repl('
  • \ - %(label)s
    • ', item)) + %(label)s', item)) } } } }); - // footer erpnext.Footer = Class.extend({ init: function() { + if(!wn.boot.website_settings.copyright) { + wn.boot.website_settings.copyright = sys_defaults.company; + } + if(!wn.boot.website_settings.address) { + wn.boot.website_settings.address = ''; + } $('footer').html(repl('
    \
      \
      © %(copyright)s | %(address)s
      \ @@ -102,14 +109,25 @@ erpnext.Footer = Class.extend({ for(var i=0;i%(label)s', item)) } } } }); +// customize hard / soft links +erpnext.header_link_settings = function(item) { + item.route = item.url || item.custom_page; + if(item.route.substr(0,4)=='http') { + item.target = 'target="_blank"'; + } else { + item.target = ''; + item.route = '#!' + item.route; + } +} + $(document).bind('startup', function() { erpnext.footer = new erpnext.Footer(); erpnext.navbar.navbar = new erpnext.navbar.Navbar(); diff --git a/js/all-app.js b/js/all-app.js index e0717431fdf..40608e7735b 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2219,8 +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('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.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');});}); /* * erpnext/startup/startup.js */ diff --git a/js/all-web.js b/js/all-web.js index 888aca2b6e3..f271a3651b6 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -830,8 +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('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.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');});}); /* * erpnext/startup/startup.js */ @@ -868,7 +867,7 @@ if(opts.callback)opts.callback(r)}});} /* * erpnext/website/js/topbar.js */ -wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('
      \ +wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html||sys_defaults.company);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('
      \
      \
      \ [brand]\ @@ -880,15 +879,19 @@ wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function() \
      \
      \ -
      ');$('.brand').attr('href','#!'+(wn.boot.website_settings.home_page||'Login Page'))},make_items:function(){var items=wn.boot.website_menus;for(var i=0;i\ - %(label)s',item))}} +
      ');$('.brand').attr('href','#!'+(wn.boot.website_settings.home_page||'Login Page'))},make_items:function(){var items=wn.boot.website_menus;for(var i=0;i\ + %(label)s',item));}} for(var i=0;i').click(function(){return false;});$parent_li.append('
        ');} -item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(repl('
      • \ - %(label)s
        • ',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('
        \ +erpnext.header_link_settings(item);$parent_li.find('.dropdown-menu').append(repl('
      • \ + %(label)s
        • ',item))}}}});erpnext.Footer=Class.extend({init:function(){if(!wn.boot.website_settings.copyright){wn.boot.website_settings.copyright=sys_defaults.company;} +if(!wn.boot.website_settings.address){wn.boot.website_settings.address='';} +$('footer').html(repl('
        \
          \
          © %(copyright)s | %(address)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))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.Navbar();}) \ No newline at end of file +for(var i=0;i%(label)s',item))}}}});erpnext.header_link_settings=function(item){item.route=item.url||item.custom_page;if(item.route.substr(0,4)=='http'){item.target='target="_blank"';}else{item.target='';item.route='#!'+item.route;}} +$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.Navbar();}) \ No newline at end of file diff --git a/js/app.js b/js/app.js index 82dd17fdddb..e994ccfb971 100644 --- a/js/app.js +++ b/js/app.js @@ -14,8 +14,8 @@ erpnext.set_about = function() { wn.modules_path = 'erpnext'; $(document).bind('toolbar_setup', function() { - $('.brand').html('erpnext\ - ') + $('.brand').html($wn.boot.website_settings.brand_html.substr(0,15) || 'erpnext' + + ' ') .hover(function() { $(this).find('.icon-home').addClass('navbar-icon-home-hover'); }, function() {