From 4b2b159d12f38f6bb2a9bea22aa2e2482adbaba0 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 30 Apr 2012 20:00:19 +0530 Subject: [PATCH 01/15] if max_users = 0, consider unlimited users --- erpnext/utilities/page/users/users.js | 2 +- erpnext/utilities/page/users/users.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index 704682eafc..28fbc1b0f4 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -223,7 +223,7 @@ $.extend(wn.pages.users, { add_user: function() { var me = wn.pages.users; var active_users = $('.user-card:not(.disabled)'); - if(wn.boot.max_users && (active_users.length >= wn.boot.max_users)) { + if(wn.boot.max_users && (active_users.length >= wn.boot.max_users) && wn.boot.max_users) { msgprint(repl("Alas!
\ You already have %(active_users)s active users, \ which is the maximum number that you are currently allowed to add.

\ diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py index 819f7bb1da..2b7c884821 100644 --- a/erpnext/utilities/page/users/users.py +++ b/erpnext/utilities/page/users/users.py @@ -112,7 +112,7 @@ def add_profile(args): active_users = sql("""select count(*) from tabProfile where ifnull(enabled, 0)=1 and docstatus<2 and name not in ('Administrator', 'Guest')""")[0][0] - if active_users >= conf.max_users: + if active_users >= conf.max_users and not conf.max_users: # same message as in users.js webnotes.msgprint("""Alas!
\ You already have %(active_users)s active users, \ From 5c2a792d03680deab68761cf6504b0493bbb5413 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 30 Apr 2012 20:03:23 +0530 Subject: [PATCH 02/15] if max_users = 0, consider unlimited users --- erpnext/utilities/page/users/users.js | 2 +- erpnext/utilities/page/users/users.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index 28fbc1b0f4..704682eafc 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -223,7 +223,7 @@ $.extend(wn.pages.users, { add_user: function() { var me = wn.pages.users; var active_users = $('.user-card:not(.disabled)'); - if(wn.boot.max_users && (active_users.length >= wn.boot.max_users) && wn.boot.max_users) { + if(wn.boot.max_users && (active_users.length >= wn.boot.max_users)) { msgprint(repl("Alas!
\ You already have %(active_users)s active users, \ which is the maximum number that you are currently allowed to add.

\ diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py index 2b7c884821..7da8003a3d 100644 --- a/erpnext/utilities/page/users/users.py +++ b/erpnext/utilities/page/users/users.py @@ -112,7 +112,7 @@ def add_profile(args): active_users = sql("""select count(*) from tabProfile where ifnull(enabled, 0)=1 and docstatus<2 and name not in ('Administrator', 'Guest')""")[0][0] - if active_users >= conf.max_users and not conf.max_users: + if active_users >= conf.max_users and conf.max_users: # same message as in users.js webnotes.msgprint("""Alas!
\ You already have %(active_users)s active users, \ From 563fcc1b05c818b6ade98596add70d3b4c9bf988 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 30 Apr 2012 21:06:31 +0530 Subject: [PATCH 03/15] fix in startup.js --- erpnext/startup/startup.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 321149cf81..5dfd692aec 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -106,7 +106,7 @@ erpnext.startup.start = function() { ', { expiry_string: expiry_string })); } else if (diff < 0) { $('header').append(repl('
\ - This ERPNext subscription has expired and should be deleted. \ + This ERPNext subscription has expired. \
', { expiry_string: expiry_string })); } } @@ -215,12 +215,3 @@ erpnext.send_message = function(opts) { } }); } - -erpnext.hide_naming_series = function() { - if(cur_frm.fields_dict.naming_series) { - hide_field('naming_series'); - if(cur_frm.doc.__islocal) { - unhide_field('naming_series'); - } - } -} From 220434c0ef1c13741d2f052a238842bae1753cf6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 30 Apr 2012 21:06:54 +0530 Subject: [PATCH 04/15] fix in startup.js --- js/all-app.js | 5 ++--- js/all-web.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 31c1e6db30..e0717431fd 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2233,11 +2233,11 @@ if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
\ - Ahem! Your ERPNext subscription will expire %(expiry_string)s. \ + Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ (and remove this annoying banner). \
',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('
\ - Ahem! This ERPNext subscription has expired and should be deleted. \ + This ERPNext subscription has expired. \
',{expiry_string:expiry_string}));}}} erpnext.set_about();$('#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);} @@ -2254,7 +2254,6 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background $(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();} if(opts.callback)opts.callback(r)}});} -erpnext.hide_naming_series=function(){console.log(1);if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}} /* * erpnext/startup/js/modules.js */ diff --git a/js/all-web.js b/js/all-web.js index ee051811e8..888aca2b6e 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -844,11 +844,11 @@ if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
\ - Ahem! Your ERPNext subscription will expire %(expiry_string)s. \ + Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ (and remove this annoying banner). \
',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('
\ - Ahem! This ERPNext subscription has expired and should be deleted. \ + This ERPNext subscription has expired. \
',{expiry_string:expiry_string}));}}} erpnext.set_about();$('#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);} @@ -865,7 +865,6 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background $(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();} if(opts.callback)opts.callback(r)}});} -erpnext.hide_naming_series=function(){console.log(1);if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}} /* * erpnext/website/js/topbar.js */ From 3f6eed2dc212092d54e0ffb64dea93f09ba94544 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 1 May 2012 12:23:28 +0530 Subject: [PATCH 05/15] fix in account subscription info box creation --- erpnext/utilities/page/users/users.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index 704682eafc..757b1a3bda 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -64,7 +64,8 @@ $.extend(wn.pages.users, { } }); if(!$('.subscription-info').length && (wn.boot.max_users || wn.boot.expires_on)) { - var $sub_info = $('
').insertAfter('.help'); + var $sub_info = $('
') + .insertAfter($(wn.pages.users).find('.help')); if(wn.boot.max_users) { $sub_info.append(repl('\ \ From 6f8e9e951eb81fc9a3874a459a5e9466be137bfe Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 13:41:44 +0530 Subject: [PATCH 06/15] website fixes --- .../doctype/style_settings/style_settings.py | 3 ++ erpnext/website/js/topbar.js | 34 ++++++++++++++----- js/all-app.js | 3 +- js/all-web.js | 21 +++++++----- js/app.js | 4 +-- 5 files changed, 44 insertions(+), 21 deletions(-) diff --git a/erpnext/website/doctype/style_settings/style_settings.py b/erpnext/website/doctype/style_settings/style_settings.py index db26a15e80..f47a427bae 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 8caf8dcf1c..e6a6b59c4a 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 e0717431fd..40608e7735 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 888aca2b6e..f271a3651b 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 82dd17fddd..e994ccfb97 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() { From 30e3f157bc04784c11157045710dc999ef0cd456 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 14:07:41 +0530 Subject: [PATCH 07/15] fix to startupjs --- erpnext/startup/event_handlers.py | 2 +- erpnext/startup/startup.js | 9 +++++++++ js/all-app.js | 3 ++- js/all-web.js | 3 ++- js/app.js | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index c58d378bd5..a67a2148b9 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -60,9 +60,9 @@ def boot_session(bootinfo): import webnotes.model.doc bootinfo['custom_css'] = webnotes.conn.get_value('Style Settings', None, 'custom_css') or '' + bootinfo['website_settings'] = webnotes.model.doc.getsingle('Website Settings') if webnotes.session['user']=='Guest': - bootinfo['website_settings'] = webnotes.model.doc.getsingle('Website Settings') bootinfo['website_menus'] = webnotes.conn.sql("""select label, url, custom_page, parent_label, parentfield from `tabTop Bar Item` where parent='Website Settings' order by idx asc""", as_dict=1) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 5dfd692aec..9ca3adc84c 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -215,3 +215,12 @@ erpnext.send_message = function(opts) { } }); } + +erpnext.hide_naming_series = function() { + if(cur_frm.fields_dict.naming_series) { + hide_field('naming_series'); + if(cur_frm.doc.__islocal) { + unhide_field('naming_series'); + } + } +} diff --git a/js/all-app.js b/js/all-app.js index 40608e7735..1d0ac8590d 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.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 */ @@ -2253,6 +2253,7 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background $(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();} if(opts.callback)opts.callback(r)}});} +erpnext.hide_naming_series=function(){if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}} /* * erpnext/startup/js/modules.js */ diff --git a/js/all-web.js b/js/all-web.js index f271a3651b..016d1a7b04 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.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 */ @@ -864,6 +864,7 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background $(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();} if(opts.callback)opts.callback(r)}});} +erpnext.hide_naming_series=function(){if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}} /* * erpnext/website/js/topbar.js */ diff --git a/js/app.js b/js/app.js index e994ccfb97..fcacec28fa 100644 --- a/js/app.js +++ b/js/app.js @@ -14,7 +14,7 @@ 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.substr(0,15) || 'erpnext' + ' ') .hover(function() { $(this).find('.icon-home').addClass('navbar-icon-home-hover'); From c56027a722fbe95d1abaea9ec90477ab0b8319b8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 14:12:19 +0530 Subject: [PATCH 08/15] added new erpnext logo in images --- images/erpnext1.png | Bin 0 -> 429 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/erpnext1.png diff --git a/images/erpnext1.png b/images/erpnext1.png new file mode 100644 index 0000000000000000000000000000000000000000..cfc3d84d24b386320b1540022f5c1e0b1f4dc6e1 GIT binary patch literal 429 zcmV;e0aE^nP)bj2ghn19Rzz~3F_8{5fI3i- z1U*9|ibowd>cCM44krixB~s5{64jHc76mXO)x}OgtU^QyzXphZK@070AZ8}Qp7lWd z8i+-KIFQJiWEr{xN7Eps4!j4%{|Vr4K&%B-Z%>4J7>*@T&sA&=6e7YyoX`p%1f)p_ z2x$`aXpNSGqYfN(;HU!!abw{fl>SbFJ>N;x^A1~ML6L~U`a85o2Lr_R&@Mw87{uy% z0mM&-L}P&kt$N`kAv8FVt0V&84iJAN%Y~p2gyOgVi31)`^&$U>2c<~%kc5#l2{Vy? zf~jL8Asm=T%fV3xjyiDEfrAtvS9N|2#Er5phStfTj(Zf5_H2UIuM|0OG>XXq009O7 XRgdXzxd!b<00000NkvXXu0mjfQUs*H literal 0 HcmV?d00001 From 6dde93d5f0f521661ed5d05b72528bcf79f5039b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 14:18:47 +0530 Subject: [PATCH 09/15] 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 1d0ac8590d..3c5bd22bd8 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 016d1a7b04..e6907bf331 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 fcacec28fa..80efaf6a38 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() { From ea943668cee2516740830364a3c0019dbe4df327 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 14:23:03 +0530 Subject: [PATCH 10/15] logout fix --- js/all-app.js | 2 +- js/all-web.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 3c5bd22bd8..44275e2cdc 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -516,7 +516,7 @@ me.list.run();});this.dialog.show();},add_column:function(c){var w=$('
          Date: Tue, 1 May 2012 14:56:20 +0530 Subject: [PATCH 11/15] fix to profile_settings --- .../home/page/profile_settings/profile_settings.html | 5 +++++ .../home/page/profile_settings/profile_settings.js | 9 ++++----- .../home/page/profile_settings/profile_settings.py | 11 +++++++++++ erpnext/startup/startup.js | 4 ++-- js/all-app.js | 8 +++++--- js/all-web.js | 8 +++++--- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/erpnext/home/page/profile_settings/profile_settings.html b/erpnext/home/page/profile_settings/profile_settings.html index e69de29bb2..49b1990efa 100644 --- a/erpnext/home/page/profile_settings/profile_settings.html +++ b/erpnext/home/page/profile_settings/profile_settings.html @@ -0,0 +1,5 @@ +
          +
          +
          +
          +
          \ No newline at end of file diff --git a/erpnext/home/page/profile_settings/profile_settings.js b/erpnext/home/page/profile_settings/profile_settings.js index f1ee6ffc6d..667265e88b 100644 --- a/erpnext/home/page/profile_settings/profile_settings.js +++ b/erpnext/home/page/profile_settings/profile_settings.js @@ -16,7 +16,6 @@ pscript['onload_profile-settings'] = function() { var wrapper = wn.pages['profile-settings']; - wrapper.className = 'layout_wrapper'; pscript.myprofile = new MyProfile(wrapper) } @@ -25,11 +24,11 @@ MyProfile = function(wrapper) { var me = this; this.make = function() { - this.head = new PageHeader(this.wrapper, 'My Profile Settings'); - this.head.add_button('Change Password', this.change_password); - this.head.add_button('Change Background', this.change_background); + this.wrapper.appframe = new wn.ui.AppFrame($(this.wrapper).find('.layout-appframe'), 'Profile Settings'); + this.wrapper.appframe.add_button('Change Password', this.change_password); + this.wrapper.appframe.add_button('Change Background', this.change_background); - this.tab = make_table($a(this.wrapper, 'div', '', {marginTop:'19px'}), + this.tab = make_table($a($(this.wrapper).find('.layout-main').get(0), 'div', '', {marginTop:'19px'}), 1, 2, '90%', ['50%', '50%'], {padding:'11px'}) this.img = $a($td(this.tab, 0, 0), 'img', '', {width: '120px', maxHeight:'200px'}); this.img.src = wn.user_info(user).image; diff --git a/erpnext/home/page/profile_settings/profile_settings.py b/erpnext/home/page/profile_settings/profile_settings.py index dc82812ee7..631d22a62e 100644 --- a/erpnext/home/page/profile_settings/profile_settings.py +++ b/erpnext/home/page/profile_settings/profile_settings.py @@ -18,11 +18,19 @@ import webnotes from webnotes.utils import load_json, cint, nowdate + +def check_demo(): + demo_user = 'demo@webnotestech.com' + if webnotes.session['user']==demo_user: + webnotes.msgprint("Can't change in demo", raise_exception=1) + + @webnotes.whitelist() def change_password(arg): """ Change password """ + check_demo() arg = load_json(arg) if not webnotes.conn.sql('select name from tabProfile where name=%s and password=password(%s)', (webnotes.session['user'], arg['old_password'])): @@ -44,6 +52,7 @@ def set_user_details(arg=None): """ updates user details given in argument """ + check_demo() from webnotes.model.doc import Document p = Document('Profile', webnotes.user.name) @@ -59,6 +68,7 @@ def set_user_image(fid, fname): """ Set uploaded image as user image """ + check_demo() from webnotes.utils.file_manager import add_file_list, remove_file user = webnotes.session['user'] @@ -76,6 +86,7 @@ def set_user_background(fid, fname): """ Set uploaded image as user image """ + check_demo() from webnotes.utils.file_manager import add_file_list, remove_file user = webnotes.session['user'] diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 9ca3adc84c..785b8ad2a2 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -85,8 +85,8 @@ erpnext.startup.start = function() { // border to the body // ------------------ - //$('footer').html('
          \ - // ERPNext | Attributions and License
          '); + $('footer').html('
          \ + ERPNext | Attributions and License
          '); // complete registration if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) { diff --git a/js/all-app.js b/js/all-app.js index 44275e2cdc..870a3da190 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -982,10 +982,11 @@ if(f.init)f.init();f.make_body();return f;} /* * lib/js/wn/ui/appframe.js */ -wn.ui.AppFrame=Class.extend({init:function(parent){this.buttons={};this.$w=$('
          ').appendTo(parent);this.$titlebar=$('
          \ +wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w=$('
          ').appendTo(parent);this.$titlebar=$('
          \ \ ×\ -
          ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) +
          ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();}) +if(title)this.title(title);},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) this.$w.append('
          ');args={label:label,icon:''};if(icon){args.icon='';} this.buttons[label]=$(repl('',args)).click(click).appendTo(this.$w.find('.appframe-toolbar'));return this.buttons[label];},clear_buttons:function(){this.$w.find('.appframe-toolbar').empty();}});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('
          \ @@ -2230,7 +2231,8 @@ if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;} if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} -erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} +erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
          \ + ERPNext | Attributions and License
          ');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
          \ Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ diff --git a/js/all-web.js b/js/all-web.js index 2071afbe84..14975f945b 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -642,10 +642,11 @@ $(wrapper).hide().fadeIn(1000);} /* * lib/js/wn/ui/appframe.js */ -wn.ui.AppFrame=Class.extend({init:function(parent){this.buttons={};this.$w=$('
          ').appendTo(parent);this.$titlebar=$('
          \ +wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w=$('
          ').appendTo(parent);this.$titlebar=$('
          \ \ ×\ -
          ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) +
          ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();}) +if(title)this.title(title);},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) this.$w.append('
          ');args={label:label,icon:''};if(icon){args.icon='';} this.buttons[label]=$(repl('',args)).click(click).appendTo(this.$w.find('.appframe-toolbar'));return this.buttons[label];},clear_buttons:function(){this.$w.find('.appframe-toolbar').empty();}});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('
          \ @@ -841,7 +842,8 @@ if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;} if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} -erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} +erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
          \ + ERPNext | Attributions and License
          ');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
          \ Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ From 58bf2379a0e23effabdcfbd5c304a08938e70564 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 15:18:26 +0530 Subject: [PATCH 12/15] double dashbaord --- erpnext/startup/startup.js | 4 ---- js/all-app.js | 1 - js/all-web.js | 1 - 3 files changed, 6 deletions(-) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 785b8ad2a2..455b850ca0 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -72,10 +72,6 @@ erpnext.startup.start = function() { // always allow apps wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat( ['To Do', 'Knowledge Base', 'Calendar', 'Activity', 'Messages']) - // allow dashboard to accounts manager - if(user_roles.indexOf('Accounts Manager')!=-1) { - wn.boot.profile.allow_modules.push('Dashboard'); - } // setup toolbar erpnext.toolbar.setup(); diff --git a/js/all-app.js b/js/all-app.js index 870a3da190..2526a05313 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2230,7 +2230,6 @@ erpnext.startup.start=function(){console.log('Starting up...');$('#startup_div') if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;} if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) -if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
          \ ERPNext | Attributions and License
          ');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
          \ diff --git a/js/all-web.js b/js/all-web.js index 14975f945b..0c1ef930ad 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -841,7 +841,6 @@ erpnext.startup.start=function(){console.log('Starting up...');$('#startup_div') if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;} if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) -if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
          \ ERPNext | Attributions and License
          ');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
          \ From 23e777545a4d226a6ad553955841a2ced1f4a919 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 1 May 2012 16:05:23 +0530 Subject: [PATCH 13/15] fix in naming series patch's execution --- erpnext/patches/patch_list.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index e0f9ea33a7..bba4562b0d 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -237,6 +237,11 @@ patch_list = [ 'patch_file': 'clean_property_setter', 'description': 'Patch related to property setter cleanup' }, + { + 'patch_module': 'patches.april_2012', + 'patch_file': 'naming_series_patch', + 'description': 'Move naming series options into property setter' + }, { 'patch_module': 'patches.jan_mar_2012', 'patch_file': 'rename_dt', @@ -267,11 +272,6 @@ patch_list = [ 'patch_file': 'reload_c_form', 'description': 'Added attchemnt option and total field' }, - { - 'patch_module': 'patches.april_2012', - 'patch_file': 'naming_series_patch', - 'description': 'Move naming series options into property setter' - }, { 'patch_module': 'patches.april_2012', 'patch_file': 'after_sync_cleanup', From 39c47a0b4b9a8d0ee774935a406d9b07fa70eab2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 16:15:09 +0530 Subject: [PATCH 14/15] blog sequence --- .../doctype/style_settings/custom_template.css | 12 ------------ .../doctype/style_settings/style_settings.txt | 18 +++--------------- erpnext/website/page/blog/blog.js | 3 ++- 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/erpnext/website/doctype/style_settings/custom_template.css b/erpnext/website/doctype/style_settings/custom_template.css index 4866ac7be5..6fe8ce5872 100644 --- a/erpnext/website/doctype/style_settings/custom_template.css +++ b/erpnext/website/doctype/style_settings/custom_template.css @@ -19,18 +19,6 @@ } {% endif %} -{% if doc.footer_font_color %} -footer { - color: {{ doc.footer_font_color }}; -} -footer a, footer a:visited, footer a:hover { - color: {{ doc.footer_font_color }}; -} -.web-footer-menu ul li { - border-right: 1px solid {{ doc.footer_font_color }}; -} -{% endif %} - {% if doc.heading_font %} h1, h2, h3, h4, h5 { font-family: '{{ doc.heading_font}}', Arial, 'Helvetica Neue' !important; diff --git a/erpnext/website/doctype/style_settings/style_settings.txt b/erpnext/website/doctype/style_settings/style_settings.txt index dd962d5459..d5a9e803ef 100644 --- a/erpnext/website/doctype/style_settings/style_settings.txt +++ b/erpnext/website/doctype/style_settings/style_settings.txt @@ -5,7 +5,7 @@ { 'creation': '2012-04-02 16:02:43', 'docstatus': 0, - 'modified': '2012-04-25 10:00:35', + 'modified': '2012-05-01 15:58:16', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -23,7 +23,7 @@ 'name': '__common__', 'section_style': u'Simple', 'show_in_menu': 0, - 'version': 23 + 'version': 1 }, # These values are common for all DocField @@ -89,23 +89,10 @@ 'permlevel': 0 }, - # DocField - { - 'colour': u'White:FFF', - 'description': u'Select a white footer foreground color if you have a dark background', - 'doctype': u'DocField', - 'fieldname': u'footer_font_color', - 'fieldtype': u'Select', - 'label': u'Footer Font Color', - 'options': u'\nwhite', - 'permlevel': 0 - }, - # DocField { 'doctype': u'DocField', 'fieldtype': u'Column Break', - 'label': u'Fonts', 'permlevel': 0, 'width': u'50%' }, @@ -143,6 +130,7 @@ # DocField { 'doctype': u'DocField', + 'fieldname': u'css', 'fieldtype': u'Section Break', 'label': u'CSS', 'permlevel': 0 diff --git a/erpnext/website/page/blog/blog.js b/erpnext/website/page/blog/blog.js index 3836f909ee..184424b203 100644 --- a/erpnext/website/page/blog/blog.js +++ b/erpnext/website/page/blog/blog.js @@ -21,7 +21,8 @@ pscript.onload_blog = function(wrapper) { query: 'select tabBlog.name, title, left(content, 1000) as content, tabBlog.modified, \ ifnull(first_name, "") as first_name, ifnull(last_name, "") as last_name \ from tabProfile, tabBlog\ - where ifnull(published,0)=1 and tabBlog.owner = tabProfile.name', + where ifnull(published,0)=1 and tabBlog.owner = tabProfile.name \ + order by tabBlog.modified desc', hide_refresh: true, no_toolbar: true, render_row: function(parent, data) { From 8360a5f7291a321b0a4a28a3cc7f114c11eef5df Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 16:23:05 +0530 Subject: [PATCH 15/15] no address in footer --- erpnext/website/js/topbar.js | 2 +- js/all-web.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/website/js/topbar.js b/erpnext/website/js/topbar.js index e6a6b59c4a..b004a6f15a 100644 --- a/erpnext/website/js/topbar.js +++ b/erpnext/website/js/topbar.js @@ -98,7 +98,7 @@ erpnext.Footer = Class.extend({ } $('footer').html(repl('
          \
            \ -
            © %(copyright)s | %(address)s
            \ +
            © %(copyright)s
            \
            Powered by \ erpnext.com
            \
            ', wn.boot.website_settings)); diff --git a/js/all-web.js b/js/all-web.js index 0c1ef930ad..a91934bfa1 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -890,7 +890,7 @@ erpnext.header_link_settings(item);$parent_li.find('.dropdown-menu').append(repl if(!wn.boot.website_settings.address){wn.boot.website_settings.address='';} $('footer').html(repl('
            \
              \ -
              © %(copyright)s | %(address)s
              \ +
              © %(copyright)s
              \
              Powered by \ erpnext.com
              \
              ',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus