diff --git a/webnotes/__init__.py b/webnotes/__init__.py index b18ba60829..e6a3e54408 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -588,7 +588,7 @@ def get_jloader(): def set_filters(jenv): from webnotes.utils import global_date_format - from webnotes.webutils import get_hex_shade + from webnotes.website.utils import get_hex_shade from markdown2 import markdown from json import dumps diff --git a/webnotes/app.py b/webnotes/app.py index ca1a355077..0a8be9bcd4 100644 --- a/webnotes/app.py +++ b/webnotes/app.py @@ -15,7 +15,7 @@ import webnotes import webnotes.handler import webnotes.auth import webnotes.api -import webnotes.webutils +import webnotes.website.render from webnotes.utils import get_site_name local_manager = LocalManager([webnotes.local]) @@ -58,7 +58,7 @@ def application(request): elif webnotes.request.path.startswith("/api/"): webnotes.api.handle() elif webnotes.local.request.method in ('GET', 'HEAD'): - webnotes.webutils.render(webnotes.request.path[1:]) + webnotes.website.render.render(webnotes.request.path[1:]) else: raise NotFound diff --git a/webnotes/boot.py b/webnotes/boot.py index 10779c7ee4..d0e3e9b769 100644 --- a/webnotes/boot.py +++ b/webnotes/boot.py @@ -11,7 +11,6 @@ import webnotes.defaults import webnotes.model.doc import webnotes.widgets.page import json -import webnotes.webutils def get_bootinfo(): """build and return boot info""" diff --git a/webnotes/cli.py b/webnotes/cli.py index a2c2fb9f43..b0c2e5e99e 100755 --- a/webnotes/cli.py +++ b/webnotes/cli.py @@ -430,9 +430,9 @@ def clear_cache(): @cmd def clear_web(): - import webnotes.webutils + import webnotes.website.render webnotes.connect() - webnotes.webutils.clear_cache() + webnotes.website.render.clear_cache() webnotes.destroy() @cmd diff --git a/webnotes/core/doctype/communication/communication.py b/webnotes/core/doctype/communication/communication.py index 80a6c20207..c033f6d43d 100644 --- a/webnotes/core/doctype/communication/communication.py +++ b/webnotes/core/doctype/communication/communication.py @@ -6,7 +6,7 @@ import webnotes import json import urllib from email.utils import formataddr -from webnotes.webutils import is_signup_enabled +from webnotes.website.utils import is_signup_enabled from webnotes.utils import get_url, cstr from webnotes.utils.email_lib.email_body import get_email from webnotes.utils.email_lib.smtp import send diff --git a/webnotes/templates/base.html b/webnotes/templates/base.html index c64588a451..71a52c3cb1 100644 --- a/webnotes/templates/base.html +++ b/webnotes/templates/base.html @@ -29,6 +29,11 @@ {%- endblock %} + {% block script -%} + + {%- endblock %} {%- endblock %}
@@ -80,10 +85,5 @@ - {% block script -%} - - {%- endblock %}