" + (value==null ? "" : $("").text(value).html()) + ""
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 4babbfb653..d86f46cfca 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -393,8 +393,11 @@ export default class GridRow {
// sync get_query
field.get_query = this.grid.get_field(df.fieldname).get_query;
- field.df.onchange = function() {
- me.grid.grid_rows[this.doc.idx-1].refresh_field(this.df.fieldname);
+
+ var field_on_change_function = field.df.onchange;
+ field.df.onchange = function(e) {
+ field_on_change_function && field_on_change_function(e);
+ me.grid.grid_rows[this.doc.idx - 1].refresh_field(this.df.fieldname);
};
field.refresh();
if(field.$input) {
diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js
index d7521b1c59..640c64d4fd 100644
--- a/frappe/public/js/frappe/form/script_manager.js
+++ b/frappe/public/js/frappe/form/script_manager.js
@@ -19,7 +19,7 @@ frappe.ui.form.on = frappe.ui.form.on_change = function(doctype, fieldname, hand
let _handler = (...args) => {
try {
- handler(...args);
+ return handler(...args);
} catch (error) {
console.error(handler);
throw error;
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 4ef6bb59e3..14c089fe39 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -57,7 +57,7 @@ frappe.ui.Filter = class {
this.conditions.push([key, __(`{0}`, [filter.label])]);
for (let fieldtype of Object.keys(this.invalid_condition_map)) {
if (!filter.valid_for_fieldtypes.includes(fieldtype)) {
- this.invalid_condition_map[fieldtype].push(filter.label);
+ this.invalid_condition_map[fieldtype].push(key);
}
}
}
@@ -243,7 +243,7 @@ frappe.ui.Filter = class {
let args = {};
if (this.filters_config[condition].depends_on) {
const field_name = this.filters_config[condition].depends_on;
- const filter_value = this.base_list.get_filter_value(field_name);
+ const filter_value = this.filter_list.get_filter_value(fieldname);
args[field_name] = filter_value;
}
frappe
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 6d8614b17f..bceed83f0c 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -195,13 +195,18 @@ frappe.ui.FilterGroup = class {
filter_items: (doctype, fieldname) => {
return !this.filter_exists([doctype, fieldname]);
},
- base_list: this.base_list,
+ filter_list: this.base_list || this,
};
let filter = new frappe.ui.Filter(args);
this.filters.push(filter);
return filter;
}
+ get_filter_value(fieldname) {
+ let filter_obj = this.filters.find(f => f.fieldname == fieldname) || {};
+ return filter_obj.value;
+ }
+
filter_exists(filter_value) {
// filter_value of form: [doctype, fieldname, condition, value]
let exists = false;
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 9dcea5f812..d1653d04c6 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -212,6 +212,55 @@ frappe.dashboard_utils = {
}
return filters;
+ },
+
+ get_dashboard_link_field() {
+ let field = {
+ label: __('Select Dashboard'),
+ fieldtype: 'Link',
+ fieldname: 'dashboard',
+ options: 'Dashboard',
+ };
+
+ if (!frappe.boot.developer_mode) {
+ field.get_query = () => {
+ return {
+ filters: {
+ is_standard: 0
+ }
+ };
+ };
+ }
+
+ return field;
+ },
+
+ get_add_to_dashboard_dialog(docname, doctype, method) {
+ const field = this.get_dashboard_link_field();
+
+ const dialog = new frappe.ui.Dialog({
+ title: __('Add to Dashboard'),
+ fields: [field],
+ primary_action: (values) => {
+ values.name = docname;
+ values.set_standard = frappe.boot.developer_mode;
+ frappe.xcall(
+ method,
+ {args: values}
+ ).then(()=> {
+ let dashboard_route_html =
+ `${values.dashboard}`;
+ let message =
+ __(`${doctype} ${values.name} added to Dashboard ` + dashboard_route_html);
+
+ frappe.msgprint(message);
+ });
+
+ dialog.hide();
+ }
+ });
+
+ return dialog;
}
};
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/help.js b/frappe/public/js/frappe/utils/help.js
index 336d1ef526..ec6f7c8158 100644
--- a/frappe/public/js/frappe/utils/help.js
+++ b/frappe/public/js/frappe/utils/help.js
@@ -17,7 +17,7 @@ frappe.help.show = function(doctype) {
frappe.help.show_video = function(youtube_id, title) {
if (frappe.utils.is_url(youtube_id)) {
- const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?/s]{11})';
+ const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^"&?\\s]{11})';
youtube_id = youtube_id.match(expression)[1];
}
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 0058310e3f..dbe591f6fd 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -6,7 +6,6 @@ frappe.breadcrumbs = {
preferred: {
"File": "",
- "Video": "",
"Dashboard": "Customization",
"Dashboard Chart": "Customization",
"Dashboard Chart Source": "Customization"
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 53d946f75d..29b21242af 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -44,26 +44,6 @@ frappe.views.CommunicationComposer = Class.extend({
}
});
- $(document).on("upload_complete", function(event, attachment) {
- if(me.dialog.display) {
- var wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
- // find already checked items
- var checked_items = wrapper.find('[data-file-name]:checked').map(function() {
- return $(this).attr("data-file-name");
- });
-
- // reset attachment list
- me.render_attach();
-
- // check latest added
- checked_items.push(attachment.name);
-
- $.each(checked_items, function(i, filename) {
- wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
- });
- }
- })
this.prepare();
this.dialog.show();
@@ -387,77 +367,86 @@ frappe.views.CommunicationComposer = Class.extend({
folder: 'Home/Attachments',
on_success: attachment => {
this.attachments.push(attachment);
- this.render_attach();
+ this.render_attachment_rows(attachment);
}
};
- if(this.frm) {
+ if (this.frm) {
args = {
doctype: this.frm.doctype,
docname: this.frm.docname,
folder: 'Home/Attachments',
on_success: attachment => {
this.frm.attachments.attachment_uploaded(attachment);
- this.render_attach();
+ this.render_attachment_rows(attachment);
}
- }
+ };
}
- $(""
- +__("Select Attachments")+"
\
- ").appendTo(attach.empty())
+ $(`
+
+ ${__("Select Attachments")}
+
+
+
+ `).appendTo(attach.empty());
+
attach
.find(".add-more-attachments a")
- .on('click',() => new frappe.ui.FileUploader(args));
- this.render_attach();
+ .on('click', () => new frappe.ui.FileUploader(args));
+ this.render_attachment_rows();
},
- render_attach:function(){
- var fields = this.dialog.fields_dict;
- var attach = $(fields.select_attachments.wrapper).find(".attach-list").empty();
- var files = [];
- if (this.attachments && this.attachments.length) {
- files = files.concat(this.attachments);
- }
- if (cur_frm) {
- files = files.concat(cur_frm.get_files());
- }
+ render_attachment_rows: function(attachment) {
+ const select_attachments = this.dialog.fields_dict.select_attachments;
+ const attachment_rows = $(select_attachments.wrapper).find(".attach-list");
+ if (attachment) {
+ attachment_rows.append(this.get_attachment_row(attachment, true));
+ } else {
+ let files = [];
+ if (this.attachments && this.attachments.length) {
+ files = files.concat(this.attachments);
+ }
+ if (this.frm) {
+ files = files.concat(this.frm.get_files());
+ }
- if(files.length) {
- $.each(files, function(i, f) {
- if (!f.file_name) return;
- f.file_url = frappe.urllib.get_full_url(f.file_url);
-
- $(repl(''
- + '
', f))
- .appendTo(attach)
- });
- }
- this.select_attachments();
- },
- select_attachments:function(){
- let me = this;
- if(me.dialog.display) {
- let wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
- let unchecked_items = wrapper.find('[data-file-name]:not(:checked)').map(function() {
- return $(this).attr("data-file-name");
- });
-
- $.each(unchecked_items, function(i, filename) {
- wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
- });
+ if (files.length) {
+ $.each(files, (i, f) => {
+ if (!f.file_name) return;
+ if (!attachment_rows.find(`[data-file-name="${f.name}"]`).length) {
+ f.file_url = frappe.urllib.get_full_url(f.file_url);
+ attachment_rows.append(this.get_attachment_row(f));
+ }
+ });
+ }
}
},
+
+ get_attachment_row(attachment, checked) {
+ return $(`
+
+
`);
+ },
+
setup_email: function() {
// email
- var me = this;
var fields = this.dialog.fields_dict;
if(this.attach_document_print) {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 4ad39634ef..3db6302188 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -168,6 +168,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
add_card_to_dashboard() {
let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
+ const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+ const set_standard = frappe.boot.developer_mode;
+
const dialog = new frappe.ui.Dialog({
title: __('Create Card'),
fields: [
@@ -192,12 +195,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
label: __('Add to Dashboard'),
fieldtype: 'Section Break'
},
- {
- fieldname: 'dashboard',
- label: __('Choose Dashboard'),
- fieldtype: 'Link',
- options: 'Dashboard',
- },
+ dashboard_field,
{
fieldname: 'cb_2',
fieldtype: 'Column Break'
@@ -213,7 +211,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (!values.label) {
values.label = `${values.report_function} of ${toTitle(values.report_field)}`;
}
- this.create_number_card(values, values.dashboard, values.label);
+ this.create_number_card(values, values.dashboard, values.label, set_standard);
dialog.hide();
}
});
@@ -224,27 +222,26 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
add_chart_to_dashboard() {
if (this.chart_fields || this.chart_options) {
+ const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+ const set_standard = frappe.boot.developer_mode;
+
const dialog = new frappe.ui.Dialog({
title: __('Create Chart'),
fields: [
- {
- fieldname: 'dashboard',
- label: 'Choose Dashboard',
- fieldtype: 'Link',
- options: 'Dashboard',
- },
{
fieldname: 'dashboard_chart_name',
label: 'Chart Name',
fieldtype: 'Data',
- }
+ },
+ dashboard_field,
],
primary_action_label: __('Add'),
primary_action: (values) => {
this.create_dashboard_chart(
this.chart_fields || this.chart_options,
values.dashboard,
- values.dashboard_chart_name
+ values.dashboard_chart_name,
+ set_standard
);
dialog.hide();
}
@@ -256,12 +253,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}
}
- create_number_card(values, dashboard_name, card_name) {
+ create_number_card(values, dashboard_name, card_name, set_standard) {
let args = {
'dashboard': dashboard_name || null,
'type': 'Report',
'report_name': this.report_name,
'filters_json': JSON.stringify(this.get_filter_values()),
+ set_standard: set_standard,
};
Object.assign(args, values);
@@ -274,7 +272,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
);
}
- create_dashboard_chart(chart_args, dashboard_name, chart_name) {
+ create_dashboard_chart(chart_args, dashboard_name, chart_name, set_standard) {
let args = {
'dashboard': dashboard_name || null,
'chart_type': 'Report',
@@ -282,7 +280,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
'type': chart_args.chart_type || frappe.model.unscrub(chart_args.type),
'color': chart_args.color,
'filters_json': JSON.stringify(this.get_filter_values()),
- 'custom_options': {}
+ 'custom_options': {},
+ 'set_standard': set_standard,
};
for (let key in chart_args) {
@@ -303,7 +302,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
'y_axis': chart_args.y_axis_fields.map(f => {
return {'y_field': f.y_field, 'color': f.color};
}),
- 'is_custom': 0
+ 'use_report_chart': 0
}
);
} else {
@@ -311,7 +310,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
Object.assign(args,
{
'chart_name': chart_name,
- 'is_custom': 1
+ 'use_report_chart': 1
}
);
}
@@ -969,8 +968,18 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (column.isHeader && !data && this.data) {
// totalRow doesn't have a data object
// proxy it using the first data object
- // this is needed only for currency formatting
- data = this.data[0];
+ // applied to Float, Currency fields, needed only for currency formatting.
+ // make first data column have value 'Total'
+ let index = 1;
+ if (this.datatable && this.datatable.options.checkboxColumn) index = 2;
+
+ if (column.colIndex === index && !value) {
+ value = "Total";
+ column.fieldtype = "Data"; // avoid type issues for value if Date column
+ } else if (in_list(["Currency", "Float"], column.fieldtype)) {
+ // proxy for currency and float
+ data = this.data[0];
+ }
}
return frappe.format(value, column,
{for_print: false, always_show_decimals: true}, data);
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index ab05abb670..0027d7402b 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -767,10 +767,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
const index = this.fields.findIndex(f => column.field === f[0]);
if (index === -1) return;
const field = this.fields[index];
- if (field[0] === 'name' && this.group_by === null) {
+
+ if (field[0] === 'name') {
this.refresh();
frappe.throw(__('Cannot remove ID field'));
}
+
this.fields.splice(index, 1);
this.build_fields();
this.setup_columns();
@@ -849,7 +851,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
columns: 2,
options: columns[this.doctype]
.filter(df => {
- return !df.hidden;
+ return !df.hidden && df.fieldname !== 'name';
})
.map(df => ({
label: __(df.label),
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index db0b7b3162..447f0f133d 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -266,7 +266,7 @@ export default class ChartWidget extends Widget {
}
get_report_chart_data(result) {
- if (result.chart && this.chart_doc.is_custom) {
+ if (result.chart && this.chart_doc.use_report_chart) {
return result.chart.data;
} else {
let y_fields = [];
@@ -638,7 +638,7 @@ export default class ChartWidget extends Widget {
update_last_synced() {
if (!this.chart_doc.last_synced_on) {
- return
+ return;
}
let last_synced_text = __("Last synced {0}", [
comment_when(this.chart_doc.last_synced_on)
@@ -680,14 +680,15 @@ export default class ChartWidget extends Widget {
}
update_default_date_filters(report_filters, chart_filters) {
- report_filters.map(f => {
- if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
- if (f.reqd || chart_filters[f.fieldname]) {
- chart_filters[f.fieldname] = f.default;
+ if (report_filters) {
+ report_filters.map(f => {
+ if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
+ if (f.reqd || chart_filters[f.fieldname]) {
+ chart_filters[f.fieldname] = f.default;
+ }
}
- }
- });
-
+ });
+ }
return chart_filters;
}
diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 575926f45c..5ab8044d97 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -165,7 +165,7 @@ export default class NumberCardWidget extends Widget {
get_number() {
return frappe.xcall(this.settings.method, this.settings.args).then(res => {
- this.settings.get_number(res);
+ return this.settings.get_number(res);
});
}
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index a5916086b0..475568b32c 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
if (step.is_single) {
route = `Form/${step.reference_document}`;
} else {
- route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`;
+ route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`;
}
let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
frappe.route_hooks.after_save = callback;
}
- frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`);
+ frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`);
}
show_quick_entry(step) {
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 233daa7a7d..3cde29ff3d 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -131,7 +131,8 @@ function shorten_number(number, country) {
const number_system = get_number_system(country);
let x = Math.abs(Math.round(number));
for (const map of number_system) {
- if (x >= map.divisor) {
+ const condition = map.condition ? map.condition(x) : x >= map.divisor;
+ if (condition) {
return Math.round(number/map.divisor) + ' ' + map.symbol;
}
}
@@ -161,9 +162,14 @@ function get_number_system(country) {
{
divisor: 1.0e+6,
symbol: 'M'
+ },
+ {
+ divisor: 1.0e+3,
+ symbol: 'K',
+ condition: (num) => num.toFixed().length > 5
}]
};
return number_system_map[country];
}
-export { generate_route, generate_grid, build_summary_item, shorten_number };
\ No newline at end of file
+export { generate_route, generate_grid, build_summary_item, shorten_number };
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 054159116f..2ca26d59e1 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,18 +174,12 @@ class ShortcutDialog extends WidgetDialog {
onchange: () => {
if (this.dialog.get_value("type") == "DocType") {
let doctype = this.dialog.get_value("link_to");
-
- doctype &&
- frappe.db
- .get_value("DocType", doctype, "issingle")
- .then((res) => {
- if (res.message && res.message.issingle) {
- this.hide_filters();
- } else {
- this.setup_filter(doctype);
- this.show_filters();
- }
- });
+ if (doctype && frappe.boot.single_types.includes(doctype)) {
+ this.hide_filters();
+ } else if (doctype) {
+ this.setup_filter(doctype);
+ this.show_filters();
+ }
} else {
this.hide_filters();
}
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 4a45cba94d..70b9ef731b 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -719,7 +719,6 @@ li.user-progress {
margin-right: 5px;
margin-left: 0px;
position: relative;
- height: 12px;
}
// Will not be required after commonifying lists with empty state
@@ -731,28 +730,11 @@ li.user-progress {
height: 100%;
}
-// mozilla doesn't support
+// Firefox doesn't support
// pseudo elements on checkbox
-@-moz-document url-prefix() {
+@supports (-moz-appearance: none) or (-ms-ime-align:auto) {
input[type="checkbox"] {
- visibility: visible;
- left: 0;
- }
-}
-
-@supports (-moz-appearance: none) {
- input[type="checkbox"] {
- visibility: visible;
- left: 0;
- }
-}
-
-// edge doesn't support pseudo elements on checkbox
-//Microsoft Edge Browser 12+ (All)
-@supports (-ms-ime-align:auto) {
- input[type="checkbox"] {
- visibility: visible;
- left: 0;
+ height: @checkbox-height !important
}
}
diff --git a/frappe/public/less/email.less b/frappe/public/less/email.less
index b6d9540586..bf0507138b 100644
--- a/frappe/public/less/email.less
+++ b/frappe/public/less/email.less
@@ -10,6 +10,13 @@ p {
margin: 1em 0 !important;
}
+.ql-editor {
+ white-space: normal;
+ p {
+ margin: 0 !important;
+ }
+}
+
hr {
border-top: 1px solid @border-color;
}
@@ -210,4 +217,4 @@ hr {
.report-title {
margin-bottom: 20px;
}
-/* csslint ignore:end */
+/* csslint ignore:end */
\ No newline at end of file
diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index f806dc2f31..ae3b269088 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -77,7 +77,7 @@
}
}
-.ql-editor .mention {
+.ql-editor:not(.read-mode) .mention {
height: auto;
width: auto;
border-radius: 10px;
@@ -132,3 +132,7 @@
margin-top: 0px;
margin-bottom: 0px;
}
+
+.ql-editor.read-mode {
+ padding: 0;
+}
\ No newline at end of file
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index edcd25ae9c..c79dfa212b 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -1,5 +1,6 @@
@import "variables";
@import "mixins";
+@import '~quill/dist/quill.core';
@import 'frappe/public/css/font-awesome';
@import "~bootstrap/scss/bootstrap";
@import 'multilevel-dropdown';
@@ -12,6 +13,20 @@
@import 'portal';
@import 'doc';
+.ql-editor.read-mode {
+ padding: 0;
+ line-height: 1.6;
+
+ h1,
+ h2,
+ h3,
+ h4,
+ h5 {
+ margin-top: 0.5em;
+ margin-bottom: 0.25em;
+ }
+}
+
.container {
padding-left: 1.25rem;
padding-right: 1.25rem;
@@ -323,4 +338,4 @@ h5.modal-title {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 0b82b3dac2..8c843a44a4 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -42,7 +42,11 @@
{{ head_include or "" }}
{% endblock -%}
- {%- block style %}{%- endblock -%}
+ {%- block style %}
+ {% if colocated_css -%}
+
+ {%- endif %}
+ {%- endblock -%}
{%- endfor -%}
- {%- block script %}{%- endblock %}
+ {%- block script %}
+ {% if colocated_js -%}
+
+ {%- endif %}
+ {%- endblock %}
{%- block body_include %}{{ body_include or "" }}{% endblock -%}
{{ doc.get(df.fieldname) }}
{% else -%}
- {%- if df.fieldtype=="Text Editor" -%}
+ {{ _("More articles on {0}").format(category.name) }}
{{ message or "" }}
{% if primary_action %} diff --git a/frappe/www/sitemap.py b/frappe/www/sitemap.py index 8b93270ab5..f8f03c45f8 100644 --- a/frappe/www/sitemap.py +++ b/frappe/www/sitemap.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import get_controller -from frappe.utils import get_request_site_address, get_datetime, nowdate +from frappe.utils import get_datetime, nowdate, get_url from frappe.website.router import get_pages, get_all_page_context_from_doctypes from six import iteritems from six.moves.urllib.parse import quote, urljoin @@ -25,13 +25,13 @@ def get_context(context): for route, page in iteritems(get_pages()): if page.sitemap: links.append({ - "loc": urljoin(host, quote(page.name.encode("utf-8"))), + "loc": get_url(quote(page.name.encode("utf-8"))), "lastmod": nowdate() }) for route, data in iteritems(get_public_pages_from_doctypes()): links.append({ - "loc": urljoin(host, quote((route or "").encode("utf-8"))), + "loc": get_url(quote((route or "").encode("utf-8"))), "lastmod": get_datetime(data.get("modified")).strftime("%Y-%m-%d") }) diff --git a/generate_bootstrap_theme.js b/generate_bootstrap_theme.js index bb2a121052..83955856f5 100644 --- a/generate_bootstrap_theme.js +++ b/generate_bootstrap_theme.js @@ -10,7 +10,7 @@ scss_content = scss_content.replace(/\\n/g, '\n'); sass.render({ data: scss_content, - outputStyle: 'compact', + outputStyle: 'compressed', importer: function(url) { if (url.startsWith('~')) { // strip ~ so that it can resolve from node_modules diff --git a/requirements.txt b/requirements.txt index e0ca1a6fad..2995553541 100644 --- a/requirements.txt +++ b/requirements.txt @@ -68,3 +68,6 @@ Werkzeug==0.16.1 Whoosh==2.7.4 xlrd==1.2.0 zxcvbn-python==4.4.24 +pycryptodome==3.9.8 +paytmchecksum==1.7.0 +wrapt==1.10.11 \ No newline at end of file
{{ _("More articles on {0}").format(category.name) }} @@ -25,4 +39,26 @@
Comments
{% include 'templates/includes/comments/comments.html' %}