@@ -37,13 +88,74 @@ export default class Widget {
this.action_area = this.widget.find(".widget-control");
this.head = this.widget.find(".widget-head");
this.footer = this.widget.find(".widget-footer");
- this.set_title();
- this.set_actions();
- this.set_body();
+ this.refresh();
}
set_title() {
- this.title_field[0].innerHTML = this.label || this.name;
+ this.title_field[0].innerHTML = this.label;
+ }
+
+ add_custom_button(html, action, class_name = "") {
+ let button = $(
+ `
${html} `
+ );
+ button.click(event => {
+ event.stopPropagation();
+ action && action();
+ });
+ button.appendTo(this.action_area);
+ }
+
+ delete() {
+ this.widget.addClass("zoomOutDelete");
+ // wait for animation
+ setTimeout(() => {
+ this.widget.remove();
+ this.options.on_delete && this.options.on_delete(this.name);
+ }, 300);
+ }
+
+ edit() {
+ const dialog_class = get_dialog_constructor(this.widget_type);
+
+ this.edit_dialog = new dialog_class({
+ label: this.label,
+ type: this.widget_type,
+ values: this.get_config(),
+ primary_action: (data) => {
+ Object.assign(this, data);
+ data.name = this.name;
+
+ this.refresh();
+ },
+ primary_action_label: __("Save")
+ });
+
+ this.edit_dialog.make();
+ }
+
+ hide_or_show() {
+ if (!this.hidden) {
+ this.body.css("opacity", 0.5);
+ this.title_field.css("opacity", 0.5);
+ this.footer.css("opacity", 0.5);
+ this.hidden = true;
+ } else {
+ this.body.css("opacity", 1);
+ this.title_field.css("opacity", 1);
+ this.footer.css("opacity", 1);
+ this.hidden = false;
+ }
+ this.show_or_hide_button.empty();
+
+ const classname = this.hidden ? 'fa fa-eye' : 'fa fa-eye-slash';
+ $(`
`).appendTo(
+ this.show_or_hide_button
+ );
+ }
+
+ setup_events() {
+ //
}
set_actions() {
@@ -53,8 +165,4 @@ export default class Widget {
set_body() {
//
}
-
- setup_events() {
- //
- }
-}
\ No newline at end of file
+}
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 174f0ae666..9c03f08523 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -9,12 +9,19 @@ export default class ChartWidget extends Widget {
this.height = 240;
}
- refresh() {
- this.make_chart();
+ get_config() {
+ return {
+ name: this.name,
+ chart_name: this.chart_name,
+ label: this.label,
+ };
}
- customize() {
- this.setup_customize_actions();
+ refresh() {
+ delete this.dashboard_chart;
+ this.set_title();
+ this.set_body();
+ this.make_chart();
}
set_body() {
@@ -67,28 +74,22 @@ export default class ChartWidget extends Widget {
}
this.setup_container();
this.prepare_chart_object();
- this.action_area.empty();
- this.prepare_chart_actions();
- this.setup_filter_button();
+ if (!this.in_customize_mode) {
+ this.action_area.empty();
+ this.prepare_chart_actions();
+ this.setup_filter_button();
- if (
- this.chart_doc.timeseries &&
- this.chart_doc.chart_type !== "Custom"
- ) {
- this.render_time_series_filters();
+ if (
+ this.chart_doc.timeseries &&
+ this.chart_doc.chart_type !== "Custom"
+ ) {
+ this.render_time_series_filters();
+ }
}
-
this.fetch_and_update_chart();
});
}
- setup_customize_actions() {
- this.action_area.empty();
- const buttons = $(`
Resize
-
`);
- buttons.appendTo(this.action_area);
- }
-
render_time_series_filters() {
let filters = [
{
@@ -428,9 +429,7 @@ export default class ChartWidget extends Widget {
}
fetch(filters, refresh = false, args) {
- let method = this.settings
- ? this.settings.method
- : "frappe.desk.doctype.dashboard_chart.dashboard_chart.get";
+ let method = this.settings.method;
if (this.chart_doc.chart_type == "Report") {
args = {
@@ -558,6 +557,9 @@ export default class ChartWidget extends Widget {
};
return Promise.resolve();
} else {
+ this.settings = {
+ method: "frappe.desk.doctype.dashboard_chart.dashboard_chart.get"
+ };
return Promise.resolve();
}
});
diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js
index e8012b03d8..f7bca23c47 100644
--- a/frappe/public/js/frappe/widgets/links_widget.js
+++ b/frappe/public/js/frappe/widgets/links_widget.js
@@ -6,8 +6,13 @@ export default class LinksWidget extends Widget {
super(opts);
}
- refresh() {
- //
+ get_config() {
+ return {
+ name: this.name,
+ links: JSON.stringify(this.links),
+ label: this.label,
+ hidden: this.hidden,
+ };
}
set_body() {
@@ -75,21 +80,22 @@ export default class LinksWidget extends Widget {
const popover = link.find(".module-link-popover");
link_label.mouseover(() => {
+ if (this.in_customize_mode) return;
popover.show();
});
link_label.mouseout(() => popover.hide());
} else {
- if (link_label.hasClass("help-video-link")) {
- link_label.click(event => {
+ link_label.click(event => {
+ if (this.in_customize_mode) return;
+
+ if (link_label.hasClass("help-video-link")) {
let yt_id = event.target.dataset.youtubeid;
frappe.help.show_video(yt_id);
- });
- } else {
- link_label.click(event => {
+ } else {
let route = event.target.dataset.route;
frappe.set_route(route);
- });
- }
+ }
+ });
}
});
}
diff --git a/frappe/public/js/frappe/widgets/new_widget.js b/frappe/public/js/frappe/widgets/new_widget.js
new file mode 100644
index 0000000000..787cb3a79c
--- /dev/null
+++ b/frappe/public/js/frappe/widgets/new_widget.js
@@ -0,0 +1,52 @@
+import get_dialog_constructor from "./widget_dialog.js";
+
+export default class NewWidget {
+ constructor(opts) {
+ Object.assign(this, opts);
+ this.make();
+ }
+
+ customize() {
+ return;
+ }
+
+ make() {
+ this.make_widget();
+ this.widget.appendTo(this.container);
+ this.setup_events();
+ }
+
+ get_title() {
+ // DO NOT REMOVE: Comment to load translation
+ // __("New Chart") __("New Shortcut")
+ return __(`New ${frappe.utils.to_title_case(this.type)}`);
+ }
+
+ make_widget() {
+ this.widget = $(`
+ + ${this.get_title()}
+
`);
+ this.body = this.widget;
+ }
+
+ setup_events() {
+ this.widget.on("click", () => this.open_dialog());
+ }
+
+ open_dialog() {
+ const dialog_class = get_dialog_constructor(this.type);
+
+ this.dialog = new dialog_class({
+ label: this.label,
+ type: this.type,
+ values: false,
+ primary_action: this.on_create,
+ });
+
+ this.dialog.make();
+ }
+
+ delete() {
+ this.widget.remove();
+ }
+}
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index ea9428972e..736af01cc5 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -3,7 +3,6 @@ import Widget from "./base_widget.js";
export default class OnboardingWidget extends Widget {
constructor(opts) {
super(opts);
- window.onb = this;
}
refresh() { }
diff --git a/frappe/public/js/frappe/widgets/shortcut_widget.js b/frappe/public/js/frappe/widgets/shortcut_widget.js
index 81ab4f05e4..572569839c 100644
--- a/frappe/public/js/frappe/widgets/shortcut_widget.js
+++ b/frappe/public/js/frappe/widgets/shortcut_widget.js
@@ -1,48 +1,62 @@
import Widget from "./base_widget.js";
import { generate_route } from "./utils";
-// import { get_luminosity, shadeColor } from "./utils";
-
-String.prototype.format = function () {
- var i = 0, args = arguments;
- return this.replace(/{}/g, function () {
- return typeof args[i] != 'undefined' ? args[i++] : '';
- });
-};
export default class ShortcutWidget extends Widget {
constructor(opts) {
super(opts);
}
- refresh() {
- //
+ get_config() {
+ return {
+ name: this.name,
+ icon: this.icon,
+ label: this.label,
+ format: this.format,
+ link_to: this.link_to,
+ color: this.color,
+ restrict_to_domain: this.restrict_to_domain,
+ stats_filter: this.stats_filter,
+ type: this.type,
+ };
}
setup_events() {
this.widget.click(() => {
- let route = generate_route(this)
- frappe.set_route(route)
- })
+ if (this.in_customize_mode) return;
+
+ let route = generate_route({
+ route: this.route,
+ name: this.link_to,
+ type: this.type,
+ is_query_report: this.is_query_report,
+ doctype: this.ref_doctype
+ });
+
+ frappe.set_route(route);
+ });
}
set_actions() {
- this.widget.addClass('shortcut-widget-box');
- const get_filter = new Function(`return ${this.stats_filter}`)
+ if (this.in_customize_mode) return;
+
+ this.widget.addClass("shortcut-widget-box");
+ const get_filter = new Function(`return ${this.stats_filter}`);
if (this.type == "DocType" && this.stats_filter) {
- frappe.db.count(this.link_to, {
- filters: get_filter()
- }).then(count => this.set_count(count))
+ frappe.db
+ .count(this.link_to, {
+ filters: get_filter(),
+ })
+ .then((count) => this.set_count(count));
}
}
set_title() {
if (this.icon) {
this.title_field[0].innerHTML = `
-
`
- }
- else {
+
`;
+ } else {
super.set_title();
}
}
@@ -50,19 +64,22 @@ export default class ShortcutWidget extends Widget {
set_count(count) {
const get_label = () => {
if (this.format) {
- return this.format.format(count);
+ return this.format.replace(/{}/g, count);
}
- return count
- }
+ return count;
+ };
this.action_area.empty();
const label = get_label();
const buttons = $(`
${label}
`);
- if(this.color) {
- buttons.css('background-color', this.color);
- buttons.css('color', frappe.ui.color.get_contrast_color(this.color))
+ if (this.color) {
+ buttons.css("background-color", this.color);
+ buttons.css(
+ "color",
+ frappe.ui.color.get_contrast_color(this.color)
+ );
}
buttons.appendTo(this.action_area);
}
-}
\ No newline at end of file
+}
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
new file mode 100644
index 0000000000..77e2d65ea3
--- /dev/null
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -0,0 +1,266 @@
+class WidgetDialog {
+ constructor(opts) {
+ Object.assign(this, opts);
+ this.editing = Boolean(this.values && Object.keys(this.values).length);
+ }
+
+ make() {
+ this.make_dialog();
+ this.setup_dialog_events();
+ this.dialog.show();
+
+ this.editing && this.set_default_values();
+ }
+
+ make_dialog() {
+ this.dialog = new frappe.ui.Dialog({
+ title: this.get_title(),
+ fields: this.get_fields(),
+ primary_action: (data) => {
+ data = this.process_data(data);
+
+ if (!this.editing) {
+ data.name = `${this.type}-${this.label}-${frappe.utils.get_random(20)}`;
+ }
+
+ this.dialog.hide();
+ this.primary_action(data);
+ },
+ primary_action_label: this.primary_action_label || __("Add"),
+ });
+ }
+
+ get_title() {
+ // DO NOT REMOVE: Comment to load translation
+ // __("New Chart") __("New Shortcut") __("Edit Chart") __("Edit Shortcut")
+
+ let action = this.editing ? "Edit" : "Add";
+ return __(`${action} ${frappe.utils.to_title_case(this.type)}`);
+ }
+
+ get_fields() {
+ //
+ }
+
+ set_default_values() {
+ return this.dialog.set_values(this.values);
+ }
+
+ process_data(data) {
+ return data;
+ }
+
+ setup_dialog_events() {
+ //
+ }
+
+ hide_field(fieldname) {
+ this.dialog.set_df_property(fieldname, "hidden", true);
+ }
+
+ show_field(fieldname) {
+ this.dialog.set_df_property(fieldname, "hidden", false);
+ }
+}
+
+class ChartDialog extends WidgetDialog {
+ constructor(opts) {
+ super(opts);
+ }
+
+ get_fields() {
+ return [
+ {
+ fieldtype: "Link",
+ fieldname: "chart_name",
+ label: "Chart Name",
+ options: "Dashboard Chart",
+ reqd: 1,
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "label",
+ label: "Label",
+ },
+ ];
+ }
+
+ process_data(data) {
+ data.label = data.label ? data.label : data.chart_name;
+ return data;
+ }
+}
+
+class ShortcutDialog extends WidgetDialog {
+ constructor(opts) {
+ super(opts);
+ }
+
+ hide_filters() {
+ this.hide_field("count_section_break");
+ this.hide_field("filters_section_break");
+ }
+
+ show_filters() {
+ this.show_field("count_section_break");
+ this.show_field("filters_section_break");
+ }
+
+ get_fields() {
+ return [
+ {
+ fieldtype: "Select",
+ fieldname: "type",
+ label: "Type",
+ reqd: 1,
+ options: "DocType\nReport\nPage",
+ onchange: () => {
+ if (this.dialog.get_value("type") == "DocType") {
+ this.dialog.fields_dict.link_to.get_query = () => {
+ return { filters: { istable: false } };
+ };
+ } else {
+ this.dialog.fields_dict.link_to.get_query = null;
+ }
+ },
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "label",
+ label: "Label",
+ },
+ {
+ fieldtype: "Column Break",
+ fieldname: "column_break_4",
+ },
+ {
+ fieldtype: "Dynamic Link",
+ fieldname: "link_to",
+ label: "Link To",
+ reqd: 1,
+ options: "type",
+ 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();
+ }
+ });
+ } else {
+ this.hide_filters();
+ }
+ },
+ },
+ {
+ fieldtype: "Section Break",
+ fieldname: "filters_section_break",
+ label: "Count Filter",
+ hidden: 1,
+ },
+ {
+ fieldtype: "HTML",
+ fieldname: "filter_area_loading",
+ },
+ {
+ fieldtype: "HTML",
+ fieldname: "filter_area",
+ hidden: 1,
+ },
+ {
+ fieldtype: "Section Break",
+ fieldname: "count_section_break",
+ label: "Count Customizations",
+ hidden: 1,
+ },
+ {
+ fieldtype: "Color",
+ fieldname: "color",
+ label: "Color",
+ },
+ {
+ fieldtype: "Column Break",
+ fieldname: "column_break_3",
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "format",
+ label: "Format",
+ description: "For Example: {} Open",
+ },
+ ];
+ }
+
+ set_default_values() {
+ super.set_default_values().then(() => {
+ this.dialog.fields_dict.link_to.df.onchange();
+ });
+ }
+
+ process_data(data) {
+ let stats_filter = {};
+
+ if (this.dialog.get_value("type") == "DocType" && this.filter_group) {
+ let filters = this.filter_group.get_filters();
+ filters.forEach((arr) => {
+ stats_filter[arr[1]] = [arr[2], arr[3]];
+ });
+
+ data.stats_filter = JSON.stringify(stats_filter);
+ }
+
+ data.label = data.label
+ ? data.label
+ : frappe.model.unscrub(data.link_to);
+
+ return data;
+ }
+
+ setup_filter(doctype) {
+ if (this.filter_group) {
+ this.filter_group.wrapper.empty();
+ delete this.filter_group;
+ }
+
+ let $loading = this.dialog.get_field("filter_area_loading").$wrapper;
+ $(`
Loading Filters... `).appendTo($loading);
+
+ this.filters = [];
+
+ if (this.values && this.values.stats_filter) {
+ const filters_json = JSON.parse(this.values.stats_filter);
+ this.filters = Object.keys(filters_json).map((filter) => {
+ let val = filters_json[filter];
+ return [this.values.link_to, filter, val[0], val[1], false];
+ });
+ }
+
+ this.filter_group = new frappe.ui.FilterGroup({
+ parent: this.dialog.get_field("filter_area").$wrapper,
+ doctype: doctype,
+ on_change: () => {},
+ });
+
+ frappe.model.with_doctype(doctype, () => {
+ this.filter_group.add_filters_to_filter_group(this.filters);
+ this.hide_field("filter_area_loading");
+ this.show_field("filter_area");
+ });
+ }
+}
+
+export default function get_dialog_constructor(type) {
+ const widget_map = {
+ chart: ChartDialog,
+ shortcut: ShortcutDialog,
+ };
+
+ return widget_map[type] || WidgetDialog;
+}
diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js
index 36fb2c9efc..4124e4b76e 100644
--- a/frappe/public/js/frappe/widgets/widget_group.js
+++ b/frappe/public/js/frappe/widgets/widget_group.js
@@ -3,46 +3,31 @@ import BaseWidget from "../widgets/base_widget";
import ShortcutWidget from "../widgets/shortcut_widget";
import LinksWidget from "../widgets/links_widget";
import OnboardingWidget from "../widgets/onboarding_widget";
+import NewWidget from "../widgets/new_widget";
-frappe.provide('frappe.widget')
+frappe.provide("frappe.widget");
const widget_factory = {
chart: ChartWidget,
base: BaseWidget,
- bookmark: ShortcutWidget,
+ shortcut: ShortcutWidget,
links: LinksWidget,
- onboarding: OnboardingWidget
+ onboarding: OnboardingWidget,
};
export default class WidgetGroup {
constructor(opts) {
Object.assign(this, opts);
- // opts = {
- // title: "CRM Dashboard",
- // container: $(''),
- // widgets: [
- // {type: "dashboard", width: "Full", options: {}}.
- // {type: "dashboard", width: "Full", options: {}}
- // ],
- // allow_delete: true,
- // allow_create: true,
- // allow_rearrange: true,
- // hide_edit_option: false,
- // collapsible: false
- // }
- window.wid_area = this;
+ this.widgets_list = [];
+ this.widgets_dict = {};
+ this.widget_order = [];
this.make();
}
make() {
this.make_container();
- this.refresh();
- }
-
- refresh() {
- this.title && this.set_title(this.title);
+ this.title && this.set_title();
this.widgets && this.make_widgets();
- this.allow_sorting && this.setup_sortable();
}
make_container() {
@@ -58,22 +43,94 @@ export default class WidgetGroup {
this.title_area = widget_area.find(".widget-group-title");
this.control_area = widget_area.find(".widget-group-control");
this.body = widget_area.find(".widget-group-body");
+ !this.widgets.length && this.widget_area.hide();
widget_area.appendTo(this.container);
}
- set_title(title) {
+ set_title() {
this.title_area[0].innerText = this.title;
}
make_widgets() {
- this.body.empty()
+ this.body.empty();
+ this.widgets.forEach((widget) => {
+ this.add_widget(widget);
+ });
+ }
+
+ add_widget(widget) {
const widget_class = widget_factory[this.type];
- this.widgets.forEach(widget => {
- new widget_class({
- ...widget,
- container: this.body
- })
+ let widget_object = new widget_class({
+ ...widget,
+ widget_type: this.type,
+ container: this.body,
+ options: {
+ ...this.options,
+ on_delete: (name) => this.on_delete(name),
+ },
+ });
+
+ this.widgets_list.push(widget_object);
+ this.widgets_dict[widget.name] = widget_object;
+
+ return widget_object;
+ }
+
+ customize() {
+ this.widget_area.show();
+ this.widgets_list.forEach((wid) => {
+ wid.customize(this.options);
+ });
+
+ this.options.allow_create && this.setup_new_widget();
+ this.options.allow_sorting && this.setup_sortable();
+ }
+
+ setup_new_widget() {
+ const max = this.options
+ ? this.options.max_widget_count || Number.POSITIVE_INFINITY
+ : Number.POSITIVE_INFINITY;
+
+ if (this.widgets_list.length < max) {
+ this.new_widget = new NewWidget({
+ container: this.body,
+ type: this.type,
+ on_create: (config) => {
+ // Remove new widget
+ this.new_widget.delete();
+ delete this.new_widget;
+
+ config.in_customize_mode = 1;
+
+ // Add new widget and customize it
+ let wid = this.add_widget(config);
+ wid.customize(this.options);
+
+ // Put back the new widget if required
+ if (this.widgets_list.length < max) {
+ this.setup_new_widget();
+ }
+ },
+ });
+ }
+ }
+
+ on_delete(name) {
+ this.widgets_list = this.widgets_list.filter((wid) => name != wid.name);
+ delete this.widgets_dict[name];
+ this.update_widget_order();
+
+ if (!this.new_widget) this.setup_new_widget();
+ }
+
+ update_widget_order() {
+ this.widget_order = [];
+ this.body.children().each((index, element) => {
+ let name = element.dataset.widgetName;
+ if (name) {
+ this.widget_order.push(name);
+ }
});
}
@@ -81,13 +138,26 @@ export default class WidgetGroup {
const container = this.body[0];
this.sortable = new Sortable(container, {
animation: 150,
- onEnd: () => {
- console.log("Sorting")
- },
- // onChoose: (evt) => this.sortable_config.on_choose(evt, container),
- // onStart: (evt) => this.sortable_config.on_start(evt, container)
+ handle: ".drag-handle",
+ onEnd: () => this.update_widget_order(),
});
}
+
+ get_widget_config() {
+ this.update_widget_order();
+ let prepared_dict = {};
+
+ this.widgets_list.forEach((wid) => {
+ let config = wid.get_config();
+ let name = config.docname ? config.docname : config.name;
+ prepared_dict[name] = config;
+ });
+
+ return {
+ order: this.widget_order,
+ widgets: prepared_dict,
+ };
+ }
}
-frappe.widget.WidgetGroup = WidgetGroup;
\ No newline at end of file
+frappe.widget.WidgetGroup = WidgetGroup;
diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 9df4addf61..2230c59ac9 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -76,6 +76,24 @@
position: relative;
min-height: 1px;
padding-right: 15px;
+
+ .desk-page.allow-customization {
+ .customize-options {
+ text-align: right;
+ margin-top: 7px;
+ color: @text-muted;
+ z-index: 99;
+
+ .save-customization {
+ cursor: pointer;
+ color: @text-color;
+ }
+
+ .discard-customization {
+ cursor: pointer;
+ }
+ }
+ }
}
@media (max-width: 768px) {
@@ -90,6 +108,9 @@
.widget-group {
margin-bottom: 25px;
+ // -webkit-animation-name: slideInUp;
+ // animation-name: slideInUp;
+ // animation-duration: 0.4s;
.widget-group-head {
display: flex;
@@ -201,6 +222,17 @@
margin-left: 5px;
}
+ .drag-handle {
+ cursor: all-scroll;
+ cursor: -webkit-grabbing;
+
+ &:active {
+ cursor: grabbing;
+ cursor: -moz-grabbing;
+ cursor: -webkit-grabbing;
+ }
+ }
+
.dashboard-date-field {
.clearfix,
.help-box {
@@ -220,6 +252,16 @@
border-color: @disabled-background
}
+ &.new-widget {
+ min-height: 65px;
+ background-color: @disabled-background;
+ color: @text-muted;
+ display: flex;
+ align-content: center;
+ justify-content: center;
+ cursor: pointer;
+ }
+
// Overrides for each widgets
&.dashboard-widget-box {
padding: 10px 15px !important;
@@ -300,6 +342,14 @@
.widget-head {
margin-top: 5px;
margin-bottom: 5px;
+
+ .widget-title {
+ i {
+ color: @text-muted;
+ font-size: 18px;
+ margin-right: 6px;
+ }
+ }
}
}
@@ -357,23 +407,153 @@
border-radius: 10px;
}
-.pill-green {
- background: #71b92c;
- // color: #000;
+@-webkit-keyframes smallBounce {
+ from,
+ 20%,
+ 53%,
+ 80%,
+ to {
+ -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+ animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+ -webkit-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+ }
+
+ 40%,
+ 43% {
+ -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ -webkit-transform: translate3d(0, -12px, 0);
+ transform: translate3d(0, -12px, 0);
+ }
+
+ 70% {
+ -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ -webkit-transform: translate3d(0, -6px, 0);
+ transform: translate3d(0, -6px, 0);
+ }
+
+ 90% {
+ -webkit-transform: translate3d(0, -4px, 0);
+ transform: translate3d(0, -4px, 0);
+ }
}
-.pill-red {
- background: @red;
+@keyframes smallBounce {
+ from,
+ 20%,
+ 53%,
+ 80%,
+ to {
+ -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+ animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+ -webkit-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+ }
+
+ 40%,
+ 43% {
+ -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ -webkit-transform: translate3d(0, -12px, 0);
+ transform: translate3d(0, -12px, 0);
+ }
+
+ 70% {
+ -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+ -webkit-transform: translate3d(0, -6px, 0);
+ transform: translate3d(0, -6px, 0);
+ }
+
+ 90% {
+ -webkit-transform: translate3d(0, -4px, 0);
+ transform: translate3d(0, -4px, 0);
+ }
}
-.pill-blue {
- background: @blue;
+.small-bounce {
+ -webkit-animation-name: smallBounce;
+ animation-name: smallBounce;
+ -webkit-transform-origin: center bottom;
+ transform-origin: center bottom;
+ animation-duration: 1s;
}
-.pill-yellow {
- background: @yellow;
+@-webkit-keyframes slideInUp {
+ from {
+ -webkit-transform: translate3d(0, 100%, 0);
+ transform: translate3d(0, 100%, 0);
+ visibility: visible;
+ }
+
+ to {
+ -webkit-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+ }
}
-.pill-orange {
- background: @orange;
+@keyframes slideInUp {
+ from {
+ -webkit-transform: translate3d(0, 100%, 0);
+ transform: translate3d(0, 100%, 0);
+ visibility: visible;
+ }
+
+ to {
+ -webkit-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+ }
+}
+
+.slide-in-up {
+ -webkit-animation-name: slideInUp;
+ animation-name: slideInUp;
+ animation-duration: 1s;
+}
+
+
+@-webkit-keyframes pulse {
+ from {
+ -webkit-transform: scale3d(1, 1, 1);
+ transform: scale3d(1, 1, 1);
+ }
+
+ 50% {
+ -webkit-transform: scale3d(1.05, 1.05, 1.05);
+ transform: scale3d(1.05, 1.05, 1.05);
+ }
+
+ to {
+ -webkit-transform: scale3d(1, 1, 1);
+ transform: scale3d(1, 1, 1);
+ }
+}
+
+@keyframes pulse {
+ from {
+ -webkit-transform: scale3d(1, 1, 1);
+ transform: scale3d(1, 1, 1);
+ }
+
+ 50% {
+ -webkit-transform: scale3d(1.05, 1.05, 1.05);
+ transform: scale3d(1.05, 1.05, 1.05);
+ }
+
+ to {
+ -webkit-transform: scale3d(1, 1, 1);
+ transform: scale3d(1, 1, 1);
+ }
+}
+
+.zoomOutDelete {
+ // -webkit-animation-name: zoomOut;
+ // animation-name: zoomOut;
+ // animation-duration: 1s;
+ transition: opacity 0.2s, visibility 0.2s, transform 0.2s;
+ transform: scale3d(0.5, 0.5, 0.5);
+ opacity: 0;
+ visibility: hidden;
}
\ No newline at end of file
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 28f08635ba..ed457a9ce8 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -262,6 +262,11 @@
border-bottom: 1px solid @border-color;
}
+.grid-form-body {
+ max-height: 75vh;
+ overflow-y: auto;
+}
+
.grid-header-toolbar {
display: flow-root;
}
diff --git a/frappe/templates/emails/delete_data_confirmation.html b/frappe/templates/emails/delete_data_confirmation.html
index e483bd59ed..126d8bcb4b 100644
--- a/frappe/templates/emails/delete_data_confirmation.html
+++ b/frappe/templates/emails/delete_data_confirmation.html
@@ -7,5 +7,6 @@
{{ _("Confirm Request") }}
- {{_("You can also copy-paste this ")}} {{_("Verification Link")}} {{_(" to your browser")}}
+ {% set verification_link = '{{ _("Verification Link") }} ' %}
+ {{_("You can also copy-paste this {0} to your browser").format(verification_link) }}
\ No newline at end of file
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 1e92015602..470ab35fb6 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -181,7 +181,7 @@ class TestDocument(unittest.TestCase):
# css attributes
xss = '
Test
'
- escaped_xss = '
Test
'
+ escaped_xss = '
Test
'
d.subject += xss
d.save()
d.reload()
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 39c8c387eb..dc4d3c5e53 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -54,8 +54,8 @@ def get_datetime(datetime_str=None):
elif isinstance(datetime_str, datetime.date):
return datetime.datetime.combine(datetime_str, datetime.time())
- # dateutil parser does not agree with dates like 0001-01-01
- if not datetime_str or (datetime_str or "").startswith("0001-01-01"):
+ # dateutil parser does not agree with dates like "0001-01-01" or "0000-00-00"
+ if not datetime_str or (datetime_str or "").startswith(("0001-01-01", "0000-00-00")):
return None
try:
diff --git a/frappe/website/desk_page/website/website.json b/frappe/website/desk_page/website/website.json
index 915a9d2554..9171018523 100644
--- a/frappe/website/desk_page/website/website.json
+++ b/frappe/website/desk_page/website/website.json
@@ -1,26 +1,29 @@
{
"cards": [
{
- "icon": "fa fa-cog",
- "links": "[\n {\n \"description\": \"Setup of top navigation bar, footer and logo.\",\n \"label\": \"Website Settings\",\n \"name\": \"Website Settings\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"List of themes for Website.\",\n \"label\": \"Website Theme\",\n \"name\": \"Website Theme\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Javascript to append to the head section of the page.\",\n \"label\": \"Website Script\",\n \"name\": \"Website Script\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Settings for About Us Page.\",\n \"label\": \"About Us Settings\",\n \"name\": \"About Us Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Settings for Contact Us Page.\",\n \"label\": \"Contact Us Settings\",\n \"name\": \"Contact Us Settings\",\n \"type\": \"doctype\"\n }\n]",
- "title": "Setup"
+ "hidden": 0,
+ "label": "Setup",
+ "links": "[\n {\n \"description\": \"Setup of top navigation bar, footer and logo.\",\n \"label\": \"Website Settings\",\n \"name\": \"Website Settings\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"List of themes for Website.\",\n \"label\": \"Website Theme\",\n \"name\": \"Website Theme\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Javascript to append to the head section of the page.\",\n \"label\": \"Website Script\",\n \"name\": \"Website Script\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Settings for About Us Page.\",\n \"label\": \"About Us Settings\",\n \"name\": \"About Us Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Settings for Contact Us Page.\",\n \"label\": \"Contact Us Settings\",\n \"name\": \"Contact Us Settings\",\n \"type\": \"doctype\"\n }\n]"
},
{
- "links": "[\n {\n \"description\": \"Single Post (article).\",\n \"label\": \"Blog Post\",\n \"name\": \"Blog Post\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"A user who posts blogs.\",\n \"label\": \"Blogger\",\n \"name\": \"Blogger\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Categorize blog posts.\",\n \"label\": \"Blog Category\",\n \"name\": \"Blog Category\",\n \"type\": \"doctype\"\n }\n]",
- "title": "Blog"
+ "hidden": 0,
+ "label": "Blog",
+ "links": "[\n {\n \"description\": \"Single Post (article).\",\n \"label\": \"Blog Post\",\n \"name\": \"Blog Post\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"A user who posts blogs.\",\n \"label\": \"Blogger\",\n \"name\": \"Blogger\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Categorize blog posts.\",\n \"label\": \"Blog Category\",\n \"name\": \"Blog Category\",\n \"type\": \"doctype\"\n }\n]"
},
{
- "icon": "fa fa-star",
- "links": "[\n {\n \"description\": \"Content web page.\",\n \"label\": \"Web Page\",\n \"name\": \"Web Page\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"User editable form on Website.\",\n \"label\": \"Web Form\",\n \"name\": \"Web Form\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Website Sidebar\",\n \"name\": \"Website Sidebar\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Embed image slideshows in website pages.\",\n \"label\": \"Website Slideshow\",\n \"name\": \"Website Slideshow\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Add meta tags to your web pages\",\n \"label\": \"Website Route Meta\",\n \"name\": \"Website Route Meta\",\n \"type\": \"doctype\"\n }\n]",
- "title": "Web Site"
+ "hidden": 0,
+ "label": "Web Site",
+ "links": "[\n {\n \"description\": \"Content web page.\",\n \"label\": \"Web Page\",\n \"name\": \"Web Page\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"User editable form on Website.\",\n \"label\": \"Web Form\",\n \"name\": \"Web Form\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Website Sidebar\",\n \"name\": \"Website Sidebar\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Embed image slideshows in website pages.\",\n \"label\": \"Website Slideshow\",\n \"name\": \"Website Slideshow\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Add meta tags to your web pages\",\n \"label\": \"Website Route Meta\",\n \"name\": \"Website Route Meta\",\n \"type\": \"doctype\"\n }\n]"
},
{
- "links": "[\n {\n \"label\": \"Portal Settings\",\n \"name\": \"Portal Settings\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n }\n]",
- "title": "Portal"
+ "hidden": 0,
+ "label": "Portal",
+ "links": "[\n {\n \"label\": \"Portal Settings\",\n \"name\": \"Portal Settings\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n }\n]"
},
{
- "links": "[\n {\n \"label\": \"Help Category\",\n \"name\": \"Help Category\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Help Article\",\n \"name\": \"Help Article\",\n \"type\": \"doctype\"\n }\n]",
- "title": "Knowledge Base"
+ "hidden": 0,
+ "label": "Knowledge Base",
+ "links": "[\n {\n \"label\": \"Help Category\",\n \"name\": \"Help Category\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Help Article\",\n \"name\": \"Help Article\",\n \"type\": \"doctype\"\n }\n]"
}
],
"category": "Modules",
@@ -34,7 +37,7 @@
"idx": 0,
"is_standard": 1,
"label": "Website",
- "modified": "2020-03-12 16:30:43.092622",
+ "modified": "2020-04-01 11:24:40.726934",
"modified_by": "Administrator",
"module": "Website",
"name": "Website",
@@ -45,30 +48,30 @@
{
"color": "",
"format": "{} Published",
- "is_query_report": 0,
+ "label": "Blog Post",
"link_to": "Blog Post",
"stats_filter": "{\"published\":\"1\"}",
"type": "DocType"
},
{
"format": "{} Active",
- "is_query_report": 0,
+ "label": "Blogger",
"link_to": "Blogger",
"stats_filter": "{\"disabled\": 0}",
"type": "DocType"
},
{
- "is_query_report": 0,
+ "label": "Web Page",
"link_to": "Web Page",
"type": "DocType"
},
{
- "is_query_report": 0,
+ "label": "Web Form",
"link_to": "Web Form",
"type": "DocType"
},
{
- "is_query_report": 0,
+ "label": "Website Settings",
"link_to": "Website Settings",
"type": "DocType"
}
diff --git a/requirements.txt b/requirements.txt
index 55a4910056..bcf3760cd8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
Babel==2.6.0
beautifulsoup4==4.8.2
bleach-whitelist==0.0.10
-bleach==3.1.2
+bleach==3.1.4
boto3==1.10.18
braintree==3.57.1
chardet==3.0.4