Rushabh Mehta
11 years ago
2 changed files with 18 additions and 9 deletions
Unified View
Diff Options
-
+13 -5frappe/__init__.py
-
+5 -4frappe/templates/base.html
+ 13
- 5
frappe/__init__.py
View File
| @@ -215,12 +215,20 @@ def set_user(username): | |||||
| def get_request_header(key, default=None): | def get_request_header(key, default=None): | ||||
| return request.headers.get(key, default) | return request.headers.get(key, default) | ||||
| def sendmail(recipients=(), sender="", subject="No Subject", message="No Message", as_markdown=False): | |||||
| import frappe.utils.email_lib | |||||
| if as_markdown: | |||||
| frappe.utils.email_lib.sendmail_md(recipients, sender=sender, subject=subject, msg=message) | |||||
| def sendmail(recipients=(), sender="", subject="No Subject", message="No Message", | |||||
| as_markdown=False, bulk=False): | |||||
| if bulk: | |||||
| import frappe.utils.email_lib.bulk | |||||
| frappe.utils.email_lib.bulk.send(recipients=recipients, sender=sender, | |||||
| subject=subject, message=msg, add_unsubscribe_link=False) | |||||
| else: | else: | ||||
| frappe.utils.email_lib.sendmail(recipients, sender=sender, subject=subject, msg=message) | |||||
| import frappe.utils.email_lib | |||||
| if as_markdown: | |||||
| frappe.utils.email_lib.sendmail_md(recipients, sender=sender, subject=subject, msg=message) | |||||
| else: | |||||
| frappe.utils.email_lib.sendmail(recipients, sender=sender, subject=subject, msg=message) | |||||
| logger = None | logger = None | ||||
| whitelisted = [] | whitelisted = [] | ||||
+ 5
- 4
frappe/templates/base.html
View File
| @@ -20,10 +20,6 @@ https://frappe.io/apps/frappe | |||||
| <meta name="{{ name }}" content="{{ metatags[name]|striptags }}"> | <meta name="{{ name }}" content="{{ metatags[name]|striptags }}"> | ||||
| {%- endfor -%} | {%- endfor -%} | ||||
| {%- endif -%} | {%- endif -%} | ||||
| {%- for link in web_include_js %} | |||||
| <script type="text/javascript" src="{{ link }}"></script> | |||||
| {%- endfor -%} | |||||
| {%- for link in web_include_css %} | {%- for link in web_include_css %} | ||||
| <link type="text/css" rel="stylesheet" href="{{ link }}"> | <link type="text/css" rel="stylesheet" href="{{ link }}"> | ||||
| {%- endfor -%} | {%- endfor -%} | ||||
| @@ -38,6 +34,7 @@ https://frappe.io/apps/frappe | |||||
| <body> | <body> | ||||
| <div id="wrap"> | <div id="wrap"> | ||||
| {%- block banner -%} | {%- block banner -%} | ||||
| {% include "templates/includes/banner_extension.html" %} | |||||
| {% if banner_html -%} | {% if banner_html -%} | ||||
| <header class="container">{{ banner_html or "" }}</header> | <header class="container">{{ banner_html or "" }}</header> | ||||
| {%- endif %} | {%- endif %} | ||||
| @@ -92,6 +89,10 @@ https://frappe.io/apps/frappe | |||||
| {%- block footer -%}{% include "templates/includes/footer.html" %}{%- endblock -%} | {%- block footer -%}{% include "templates/includes/footer.html" %}{%- endblock -%} | ||||
| </div> | </div> | ||||
| {%- for link in web_include_js %} | |||||
| <script type="text/javascript" src="{{ link }}"></script> | |||||
| {%- endfor -%} | |||||
| {%- block script %} | {%- block script %} | ||||
| <script data-html-block="script"> | <script data-html-block="script"> | ||||
| {%- if script is defined -%}{{ script }}{%- endif -%} | {%- if script is defined -%}{{ script }}{%- endif -%} | ||||