From d7f4f865cbfc9890d50f32307f0744baf48b4c4d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Dec 2019 15:15:29 +0530 Subject: [PATCH 1/8] fix: wider msg dialog for changelog --- frappe/public/js/frappe/desk.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 92194acdca..6d51342d82 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -466,10 +466,19 @@ frappe.Application = Class.extend({ show_change_log: function() { var me = this; - var d = frappe.msgprint( - frappe.render_template("change_log", {"change_log": frappe.boot.change_log}), - __("Updated To New Version") - ); + let change_log = frappe.boot.change_log; + + change_log.forEach(log => { + log.change_log.forEach(version_info => { + version_info[1] = version_info[1].replace(/#/, '##') + }) + }) + + var d = frappe.msgprint({ + message: frappe.render_template("change_log", {"change_log": change_log}), + title: __("Updated To New Version 🎉"), + wide: true + }); d.keep_open = true; d.custom_onhide = function() { frappe.call({ From e1754d78ef19955e465905e5bd7a46a7cab0400e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Dec 2019 15:26:33 +0530 Subject: [PATCH 2/8] feat: allow overflow scroll for msgprint body --- frappe/public/js/frappe/ui/messages.js | 9 +++++++++ frappe/public/less/common.less | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 08711a8237..6070acfe6e 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -207,6 +207,15 @@ frappe.msgprint = function(msg, title) { frappe.msg_dialog.wrapper.classList.add('msgprint-dialog'); } + if (data.scroll) { + frappe.msg_dialog.body.classList.add('msgprint-scroll'); + } else { + // limit modal height and allow scrolling instead + if (frappe.msg_dialog.body.classList.contains('msgprint-scroll')) { + frappe.msg_dialog.body.classList.remove('msgprint-scroll'); + } + } + if(msg_exists) { frappe.msg_dialog.msg_area.append("
"); diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index 0f49c43de1..785327e35c 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -153,6 +153,11 @@ a.badge-hover& { } } +.msgprint-scroll { + max-height: 36em; + overflow: scroll; +} + .msgprint { // margin: 15px 0px; // text-align: center; From 0ac077f43131455141156ebc09d2528bac777018 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Dec 2019 15:26:52 +0530 Subject: [PATCH 3/8] feat: enable scroll for changelog dialog --- frappe/public/js/frappe/desk.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 6d51342d82..148871e6b7 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -477,7 +477,8 @@ frappe.Application = Class.extend({ var d = frappe.msgprint({ message: frappe.render_template("change_log", {"change_log": change_log}), title: __("Updated To New Version 🎉"), - wide: true + wide: true, + scroll: true }); d.keep_open = true; d.custom_onhide = function() { From 7b07df513c71e43e01bf81d80f68e2010b8825b8 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Dec 2019 15:28:34 +0530 Subject: [PATCH 4/8] style: better variable names --- frappe/public/js/frappe/desk.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 148871e6b7..d66105b401 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -474,14 +474,14 @@ frappe.Application = Class.extend({ }) }) - var d = frappe.msgprint({ + var change_log_dialog = frappe.msgprint({ message: frappe.render_template("change_log", {"change_log": change_log}), title: __("Updated To New Version 🎉"), wide: true, scroll: true }); - d.keep_open = true; - d.custom_onhide = function() { + change_log_dialog.keep_open = true; + change_log_dialog.custom_onhide = function() { frappe.call({ "method": "frappe.utils.change_log.update_last_known_versions" }); From 6a719502144d3319768135889c7ecc1ad9fc9b26 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Dec 2019 15:39:28 +0530 Subject: [PATCH 5/8] style: added comments --- frappe/public/js/frappe/desk.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index d66105b401..314a032985 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -468,9 +468,21 @@ frappe.Application = Class.extend({ var me = this; let change_log = frappe.boot.change_log; + // frappe.boot.change_log = [{ + // "change_log": [ + // [, ], + // [, ], + // ], + // "description": "ERP made simple", + // "title": "ERPNext", + // "version": "12.2.0" + // }]; + + // Iterate over changelog change_log.forEach(log => { log.change_log.forEach(version_info => { version_info[1] = version_info[1].replace(/#/, '##') + // replace all # with ## for rendering them as

}) }) From eab6cb76b851da5b581f26e9b29593f440b51290 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Dec 2019 15:47:49 +0530 Subject: [PATCH 6/8] style: better comments --- frappe/public/js/frappe/ui/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 6070acfe6e..2265203ef9 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -208,9 +208,9 @@ frappe.msgprint = function(msg, title) { } if (data.scroll) { + // limit modal height and allow scrolling instead frappe.msg_dialog.body.classList.add('msgprint-scroll'); } else { - // limit modal height and allow scrolling instead if (frappe.msg_dialog.body.classList.contains('msgprint-scroll')) { frappe.msg_dialog.body.classList.remove('msgprint-scroll'); } From f149a789f4bd7c08d752621ba5d2699b61579715 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 9 Dec 2019 10:29:45 +0530 Subject: [PATCH 7/8] style: added semi-colon --- frappe/public/js/frappe/desk.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 314a032985..cb52406b1e 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -481,10 +481,10 @@ frappe.Application = Class.extend({ // Iterate over changelog change_log.forEach(log => { log.change_log.forEach(version_info => { - version_info[1] = version_info[1].replace(/#/, '##') + version_info[1] = version_info[1].replace(/#/, '##'); // replace all # with ## for rendering them as

- }) - }) + }); + }); var change_log_dialog = frappe.msgprint({ message: frappe.render_template("change_log", {"change_log": change_log}), From f8cda37127d3e675b545d9279a2f7d0ea0e24749 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 20 Dec 2019 15:41:35 +0530 Subject: [PATCH 8/8] refactor: override style for changelog modal --- frappe/public/js/frappe/change_log.html | 2 ++ frappe/public/js/frappe/desk.js | 7 ------- frappe/public/less/desk.less | 6 ++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/change_log.html b/frappe/public/js/frappe/change_log.html index c05aadfe27..fce6539abc 100644 --- a/frappe/public/js/frappe/change_log.html +++ b/frappe/public/js/frappe/change_log.html @@ -6,11 +6,13 @@ {{ app_info.title }} {{ __("updated to {0}", [app_info.version]) }}

+
{% for (var x=0, y=app_info.change_log.length; x < y; x++) { var version_info = app_info.change_log[x]; if(version_info) { %}

{{ frappe.markdown(version_info[1]) }}

{% } } %} +
{% } %} diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index cb52406b1e..23d7bffec2 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -479,13 +479,6 @@ frappe.Application = Class.extend({ // }]; // Iterate over changelog - change_log.forEach(log => { - log.change_log.forEach(version_info => { - version_info[1] = version_info[1].replace(/#/, '##'); - // replace all # with ## for rendering them as

- }); - }); - var change_log_dialog = frappe.msgprint({ message: frappe.render_template("change_log", {"change_log": change_log}), title: __("Updated To New Version 🎉"), diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 0a8062efa2..fa29d7d788 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -1137,3 +1137,9 @@ body.no-sidebar { .alt-pressed .alt-underline { text-decoration: underline; } + +.app-change-log-body { + h1 { + font-size: 20px; + } +}