From 9c7a01ade9ebba326324c1f0551bb16262b51b17 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 25 Jan 2012 11:04:54 +0530 Subject: [PATCH] starting up --- erpnext/startup/startup.js | 3 +++ erpnext/website/page/home/home.html | 10 +++++----- index.html | 2 +- version.num | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index fe31eab15df..f97eb39bc13 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -11,6 +11,8 @@ erpnext.startup.set_globals = function() { } erpnext.startup.start = function() { + $('#startup_div').html('Starting up...').toggle(true); + erpnext.startup.set_globals(); if(user == 'Guest'){ @@ -33,6 +35,7 @@ erpnext.startup.start = function() { $('footer').html(''); + $('#startup_div').toggle(false); } // chart of accounts diff --git a/erpnext/website/page/home/home.html b/erpnext/website/page/home/home.html index 3c1bc5ea9ad..a07fe939b54 100644 --- a/erpnext/website/page/home/home.html +++ b/erpnext/website/page/home/home.html @@ -1,17 +1,17 @@ #!python from webnotes.model.doc import getsingle +from jinja2 import Template -home_settings = getsingle('Home Settings') -html= """ +temp = Template("""
- %(banner_html)s + {{ home_settings.banner_html }}
-""" % home_settings +""") out = { - "content": html + "content": temp.render(home_settings = getsingle('Home Settings')) } \ No newline at end of file diff --git a/index.html b/index.html index 0f6b0db0159..6302c4d739f 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ ERPNext -