[merge]
diff --git a/patches/may_2013/p06_make_notes.py b/patches/may_2013/p06_make_notes.py
index a83766a..597468a 100644
--- a/patches/may_2013/p06_make_notes.py
+++ b/patches/may_2013/p06_make_notes.py
@@ -1,4 +1,4 @@
-import webnotes
+import webnotes, markdown2
def execute():
webnotes.reload_doc("utilities", "doctype", "note")
@@ -12,13 +12,13 @@
note = webnotes.bean({
"doctype":"Note",
"title": name,
- "content": "<hr>".join(webnotes.conn.sql_list("""select answer
- from tabAnswer where question=%s""", question.name)),
+ "content": "<hr>".join([markdown2.markdown(c) for c in webnotes.conn.sql_list("""
+ select answer from tabAnswer where question=%s""", question.name)]),
"owner": question.owner,
"creation": question.creation,
"public": 1
}).insert()
-
+
webnotes.delete_doc("DocType", "Question")
webnotes.delete_doc("DocType", "Answer")
webnotes.bean("Style Settings").save()
diff --git a/public/js/conf.js b/public/js/conf.js
index b2f6dc9..1054bfc 100644
--- a/public/js/conf.js
+++ b/public/js/conf.js
@@ -15,7 +15,8 @@
// add toolbar icon
$(document).bind('toolbar_setup', function() {
- $('.navbar-brand').html('<i class="icon-home icon-white navbar-icon-home" ></i>')
+ $('.navbar-brand').html((wn.boot.website_settings.brand_html || 'erpnext') +
+ ' <i class="icon-home icon-white navbar-icon-home" ></i>')
.css('max-width', '200px').css('overflow', 'hidden')
.hover(function() {
$(this).find('.icon-home').addClass('navbar-icon-home-hover');