From d9a596c09bf7d22893a2e9c7f0d40a1e66f2d717 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 10 Jul 2020 11:41:46 +0530 Subject: [PATCH] fix: Sidebar style - Refactor assignments - Replace few svgs --- frappe/public/icons/timeless/symbol-defs.svg | 9 +- .../js/frappe/form/sidebar/assign_to.js | 84 +++++++++---------- .../public/js/frappe/form/sidebar/review.js | 5 +- .../frappe/form/templates/form_sidebar.html | 40 ++++++--- frappe/public/scss/sidebar.scss | 20 ++++- 5 files changed, 96 insertions(+), 62 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 62206851f8..21b364e272 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -46,7 +46,8 @@ - + + - + @@ -425,10 +426,6 @@ - - - diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js index 95ceb246e6..e11ec7075d 100644 --- a/frappe/public/js/frappe/form/sidebar/assign_to.js +++ b/frappe/public/js/frappe/form/sidebar/assign_to.js @@ -21,61 +21,59 @@ frappe.ui.form.AssignTo = Class.extend({ this.parent.toggle(true); this.render(this.frm.get_docinfo().assignments); }, - render: function(d) { - var me = this; - this.frm.get_docinfo().assignments = d; + render: function(assignments) { + this.frm.get_docinfo().assignments = assignments; this.parent.find(".assignment-row").remove(); - if(me.primary_action) { - me.primary_action.remove(); - me.primary_action = null; + if (this.primary_action) { + this.primary_action.remove(); + this.primary_action = null; } - if(this.dialog) { + if (this.dialog) { this.dialog.hide(); } - if(d && d.length) { - for(var i=0; i 10) { - info._fullname = info.fullname.substr(0, 10) + '...'; - } + assignments.forEach(assignment => { + let user_info = frappe.user_info(assignment.owner); + user_info.assign_to_name = assignment.name; + user_info.owner = assignment.owner; + user_info.avatar = frappe.avatar(assignment.owner); + user_info.description = assignment.description || ""; - $(repl('
  • \ - ×\ - %(avatar)s\ - %(_fullname)s\ -
    • ', info)) - .insertBefore(this.parent.find('.add-assignment')); - - if(d[i].owner===frappe.session.user) { - me.primary_action = this.frm.page.add_menu_item(__("Assignment Complete"), function() { - me.remove(frappe.session.user); - }, "fa fa-check", "btn-success") - } - - if(!(d[i].owner === frappe.session.user || me.frm.perm[0].write)) { - me.parent.find('a.close').remove(); - } + this.get_assignment_block(user_info).insertBefore(add_assignment_button); + if (assignment.owner===frappe.session.user) { + this.primary_action = this.frm.page.add_menu_item(__("Assignment Complete"), () => { + this.remove(frappe.session.user); + }, "fa fa-check", "btn-success"); } - // set remove - this.parent.find('a.close').click(function() { - me.remove($(this).attr('data-owner')); - return false; - }); + if (!(assignment.owner === frappe.session.user || this.frm.perm[0].write)) { + this.parent.find('a.remove-btn').remove(); + } - //this.btn_wrapper.addClass("hide"); - } else { - //this.btn_wrapper.removeClass("hide"); - } + }); + + // set remove + this.parent.find('a.remove-btn').click(el => { + this.remove(el.attr('data-owner')); + return false; + }); + + }, + get_assignment_block(assignee_info) { + return $(` +
  • +
    + ${assignee_info.fullname} + + ${frappe.utils.icon('close')} + +
    +
    • + `); }, add: function() { var me = this; diff --git a/frappe/public/js/frappe/form/sidebar/review.js b/frappe/public/js/frappe/form/sidebar/review.js index 2cf2980bf7..9429a40afc 100644 --- a/frappe/public/js/frappe/form/sidebar/review.js +++ b/frappe/public/js/frappe/form/sidebar/review.js @@ -23,7 +23,10 @@ frappe.ui.form.Review = class Review { make_review_container() { this.parent.append(`
      -
    • ${__('Reviews')}
      • +
    • + ${frappe.ui.icon('review')} + ${__('Reviews')} +
    `); diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 96dc4db83a..3fb71ffe2b 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -40,7 +40,7 @@
  • -
      +
        -
      • {%= __("Tags") %}
        • +
      • + + {%= __("Tags") %} +
      • @@ -71,15 +86,18 @@
        -
      • {%= __("Shared With") %}
        • +
      • + + {%= __("Shared With") %} +
        diff --git a/frappe/public/scss/sidebar.scss b/frappe/public/scss/sidebar.scss index c07cbbd8a2..b4d1ad95d2 100644 --- a/frappe/public/scss/sidebar.scss +++ b/frappe/public/scss/sidebar.scss @@ -57,6 +57,7 @@ body[data-route^="Module"] .main-menu { padding-top: $padding-lg; } .sidebar-label { + margin-bottom: $margin-xs; font-weight: 500; color: var(--grey-900); } @@ -399,7 +400,24 @@ body[data-route^="Module"] .main-menu { } .assignment-row { - margin-bottom: 5px; + margin-bottom: $margin-xs; + margin-right: $margin-xs; + display: inline-block; + .assignment-pill { + .pill-label { + margin-right: $margin-xs; + } + background-color: var(--grey-2-50); + border-radius: var(--border-radius); + padding: $padding-xs $padding-sm; + } +} + +.add-assignment-btn { + display: inline-block; + .btn { + padding: $padding-xs; + } } .review-list {