Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index 00cf1de..5bfe4a7 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -97,7 +97,7 @@
self.create_email_digest()
webnotes.clear_cache()
- msgprint("Company setup is complete")
+ msgprint("Company setup is complete. Please refresh the page before continuing.")
import webnotes.utils
user_fullname = (args.get('first_name') or '') + (args.get('last_name')
diff --git a/website/doctype/blog/blog.py b/website/doctype/blog/blog.py
index d7ffdac..c9ddda6 100644
--- a/website/doctype/blog/blog.py
+++ b/website/doctype/blog/blog.py
@@ -29,7 +29,8 @@
self.doc.name = page_name(self.doc.title)
def validate(self):
- self.doc.blog_intro = self.doc.blog_intro[:140]
+ if self.doc.blog_intro:
+ self.doc.blog_intro = self.doc.blog_intro[:140]
def on_update(self):
from website.utils import update_page_name
@@ -71,7 +72,7 @@
self.doc.updated = global_date_format(self.doc.creation)
self.doc.content_html = self.doc.content
if self.doc.blogger:
- self.doc.blogger_info = webnotes.doc("blogger", self.doc.blogger).fields
+ self.doc.blogger_info = webnotes.doc("Blogger", self.doc.blogger).fields
if self.doc.blogger_info.avatar and not "/" in self.doc.blogger_info.avatar:
self.doc.blogger_info.avatar = "files/" + self.doc.blogger_info.avatar
diff --git a/website/doctype/blogger/blogger.py b/website/doctype/blogger/blogger.py
index 28d0f29..926f7a2 100644
--- a/website/doctype/blogger/blogger.py
+++ b/website/doctype/blogger/blogger.py
@@ -13,6 +13,6 @@
for blog in webnotes.conn.sql_list("""select name from tabBlog where owner=%s
and ifnull(blogger,'')=''""", self.doc.profile):
b = webnotes.bean("Blog", blog)
- b.blogger = self.doc.name
+ b.doc.blogger = self.doc.name
b.save()
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index e625f95..8e41377 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -34,9 +34,9 @@
font-family: '{{ doc.google_web_font_for_heading or doc.heading_font }}', Arial, 'Helvetica Neue' !important;
}
{% endif %}
-{% if doc.heading_text_as %}
+{% if doc.heading_text_style %}
h1, h2, h3, h4, h5 {
- text-transform: {{ doc.heading_text_as }};
+ text-transform: {{ doc.heading_text_style }};
}
{% endif %}
@@ -124,7 +124,32 @@
box-shadow: none;
}
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown > .dropdown-toggle:hover .caret {
border-top-color: #{{ doc.top_bar_foreground or "fff"}};
border-bottom-color: #{{ doc.top_bar_foreground or "fff"}};
}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle:hover .caret {
+ border-top-color: #{{ doc.top_bar_background or "000"}};
+ border-bottom-color: #{{ doc.top_bar_background or "000"}};
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+ color: #{{ doc.top_bar_background or "000"}};
+ background-color: #{{ doc.top_bar_foreground or "fff"}};
+}
+
+@media (max-width: 800px) {
+ .navbar-inverse .nav-collapse .nav > li > a,
+ .navbar-inverse .nav-collapse .dropdown-menu a {
+ background-color: #{{ doc.top_bar_background or "000"}};
+ color: #{{ doc.top_bar_foreground or "fff"}};
+ }
+ .navbar-inverse .nav-collapse .nav > li > a:hover,
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+ background-color: #{{ doc.top_bar_foreground or "fff"}};
+ color: #{{ doc.top_bar_background or "000"}};
+ }
+}
diff --git a/website/doctype/style_settings/style_settings.py b/website/doctype/style_settings/style_settings.py
index 0a1a2e0..434f4b5 100644
--- a/website/doctype/style_settings/style_settings.py
+++ b/website/doctype/style_settings/style_settings.py
@@ -40,7 +40,7 @@
from webnotes.sessions import clear_cache
clear_cache('Guest')
- for f in ["small_font_size", "at_import"]:
+ for f in ["small_font_size", "at_import", "heading_text_style"]:
if f in self.doc.fields:
del self.doc.fields[f]
@@ -60,7 +60,7 @@
fonts = list(set(fonts))
if self.doc.heading_text_as:
- self.doc.heading_text_as = {
+ self.doc.heading_text_style = {
"UPPERCASE": "uppercase",
"Title Case":"capitalize",
"lowercase": "lowercase"
@@ -68,7 +68,7 @@
self.doc.at_import = ""
for f in fonts:
- self.doc.at_import += "\n@import url(http://fonts.googleapis.com/css?family=%s);" % f.replace(" ", "+")
+ self.doc.at_import += "\n@import url(http://fonts.googleapis.com/css?family=%s:400,700);" % f.replace(" ", "+")
def on_update(self):
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index ab6a69e..e582d0a 100644
--- a/website/templates/html/outer.html
+++ b/website/templates/html/outer.html
@@ -1,7 +1,3 @@
-{#
- requires, brand_html, top_bar_items, footer_items, copyright, content, address
-#}
-
{% extends "html/base.html" %}
{% block body %}