vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[theme] [fix] make theme pickable

Browse source
This commit is contained in:
Rushabh Mehta 2015-04-21 12:16:17 +05:30
parent 3a3db0afe5
commit 9907cd7d9e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/form/control.js
View file

@ -512,7 +512,9 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
},
validate: function(value, callback) {
if(!dateutil.validate(value)) {
msgprint (__("Date must be in format: {0}", [sys_defaults.date_format || "yyyy-mm-dd"]));
if(value) {
msgprint (__("Date must be in format: {0}", [sys_defaults.date_format || "yyyy-mm-dd"]));
}
callback("");
return;
}
@ -970,7 +972,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
if(this.df.get_route_options_for_new_doc) {
frappe.route_options = this.df.get_route_options_for_new_doc(this);
}
}ust
if(this.frm) {
this.frm.new_doc(doctype, this, new_options);

2
frappe/templates/pages/website_theme.css
View file

@ -74,6 +74,6 @@ a:active {
border-color: {{ theme.border_color }};
}
{% if theme.css -%} {% include theme.css %} {%- endif %}
{% if theme.css -%} {{ theme.css }} {%- endif %}
{%- endif -%}

2
frappe/templates/pages/website_theme.py
View file

@ -52,5 +52,3 @@ def prepare(theme):
theme.webfont_import += "\n" + "\n".join(webfont_import)
for wfimport in webfont_import:
theme.css = theme.css.replace(wfimport, "")
theme.css = frappe.get_jenv().from_string(theme.css)