starting up
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index fe31eab..f97eb39 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -11,6 +11,8 @@
}
erpnext.startup.start = function() {
+ $('#startup_div').html('Starting up...').toggle(true);
+
erpnext.startup.set_globals();
if(user == 'Guest'){
@@ -33,6 +35,7 @@
$('footer').html('<div class="erpnext-footer">\
Powered by <a href="https://erpnext.com">ERPNext</a></div>');
+ $('#startup_div').toggle(false);
}
// chart of accounts
diff --git a/erpnext/website/page/home/home.html b/erpnext/website/page/home/home.html
index 3c1bc5e..a07fe93 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("""
<div class="layout_wrapper">
<div id="content-home">
- %(banner_html)s
+ {{ home_settings.banner_html }}
</div>
</div>
-""" % 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 0f6b0db..6302c4d 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
- <script type="text/javascript">window._version_number="191";
+ <script type="text/javascript">window._version_number="192";
/*
* lib/js/wn/class.js
diff --git a/version.num b/version.num
index 946b551..681cf04 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-191
\ No newline at end of file
+192
\ No newline at end of file