diff --git a/frappe/contacts/doctype/contact/contact.json b/frappe/contacts/doctype/contact/contact.json index 2e2fb6df67..696cd61d6c 100644 --- a/frappe/contacts/doctype/contact/contact.json +++ b/frappe/contacts/doctype/contact/contact.json @@ -34,8 +34,8 @@ "email_ids", "phone_nos", "contact_details", - "is_primary_contact", "links", + "is_primary_contact", "more_info", "department", "unsubscribed" @@ -248,8 +248,9 @@ "icon": "fa fa-user", "idx": 1, "image_field": "image", + "index_web_pages_for_search": 1, "links": [], - "modified": "2020-04-06 18:25:28.223693", + "modified": "2020-08-27 14:12:09.906719", "modified_by": "Administrator", "module": "Contacts", "name": "Contact", diff --git a/frappe/desk/doctype/note/note_list.js b/frappe/desk/doctype/note/note_list.js index c2758ce53b..30ae7862ca 100644 --- a/frappe/desk/doctype/note/note_list.js +++ b/frappe/desk/doctype/note/note_list.js @@ -7,7 +7,7 @@ frappe.listview_settings['Note'] = { if(doc.public) { return [__("Public"), "green", "public,=,Yes"]; } else { - return [__("Private"), "darkgrey", "public,=,No"]; + return [__("Private"), "darkgray", "public,=,No"]; } } } diff --git a/frappe/email/doctype/email_account/email_account_list.js b/frappe/email/doctype/email_account/email_account_list.js index f3bbd99e9b..fa36626abf 100644 --- a/frappe/email/doctype/email_account/email_account_list.js +++ b/frappe/email/doctype/email_account/email_account_list.js @@ -2,19 +2,19 @@ frappe.listview_settings["Email Account"] = { add_fields: ["default_incoming", "default_outgoing", "enable_incoming", "enable_outgoing"], get_indicator: function(doc) { if(doc.default_incoming && doc.default_outgoing) { - var color = (doc.enable_incoming && doc.enable_outgoing) ? "blue" : "darkgrey"; + var color = (doc.enable_incoming && doc.enable_outgoing) ? "blue" : "darkgray"; return [__("Default Sending and Inbox"), color, "default_incoming,=,Yes|default_outgoing,=,Yes"] } else if(doc.default_incoming) { - var color = doc.enable_incoming ? "blue" : "darkgrey"; + var color = doc.enable_incoming ? "blue" : "darkgray"; return [__("Default Inbox"), color, "default_incoming,=,Yes"]; } else if(doc.default_outgoing) { - var color = doc.enable_outgoing ? "blue" : "darkgrey"; + var color = doc.enable_outgoing ? "blue" : "darkgray"; return [__("Default Sending"), color, "default_outgoing,=,Yes"]; } else { - var color = doc.enable_incoming ? "blue" : "darkgrey"; + var color = doc.enable_incoming ? "blue" : "darkgray"; return [__("Inbox"), color, "is_global,=,No|is_default=No"]; } } diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js index 6b723d508c..1f0f9881b2 100644 --- a/frappe/public/js/frappe/chat.js +++ b/frappe/public/js/frappe/chat.js @@ -682,7 +682,7 @@ frappe.chat.profile.STATUSES }, { name: "Offline", - color: "darkgrey" + color: "darkgray" } ] diff --git a/frappe/public/js/frappe/model/indicator.js b/frappe/public/js/frappe/model/indicator.js index c7290e05d5..c8732bd60b 100644 --- a/frappe/public/js/frappe/model/indicator.js +++ b/frappe/public/js/frappe/model/indicator.js @@ -45,7 +45,7 @@ frappe.get_indicator = function(doc, doctype) { "Info": "light-blue", }[locals["Workflow State"][value].style]; } - if(!colour) colour = "darkgrey"; + if(!colour) colour = "darkgray"; return [__(value), colour, workflow_fieldname + ',=,' + value]; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 8910384a9e..10da5d7010 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -398,7 +398,7 @@ Object.assign(frappe.utils, { }, guess_style: function(text, default_style, _colour) { var style = default_style || "default"; - var colour = "darkgrey"; + var colour = "darkgray"; if (text) { if (has_words(["Pending", "Review", "Medium", "Not Approved"], text)) { style = "warning"; diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index b71e04365d..53d7f1ce76 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -642,7 +642,7 @@ frappe.provide("frappe.views"); title: col.column_name, status: col.status, order: col.order, - indicator: col.indicator || 'darkgrey' + indicator: col.indicator || 'darkgray' }; }); } diff --git a/frappe/website/doctype/blog_post/blog_post_list.js b/frappe/website/doctype/blog_post/blog_post_list.js index bddc051869..6e194ac693 100644 --- a/frappe/website/doctype/blog_post/blog_post_list.js +++ b/frappe/website/doctype/blog_post/blog_post_list.js @@ -4,7 +4,7 @@ frappe.listview_settings['Blog Post'] = { if(doc.published) { return [__("Published"), "green", "published,=,Yes"]; } else { - return [__("Not Published"), "darkgrey", "published,=,Yes"]; + return [__("Not Published"), "darkgray", "published,=,Yes"]; } } }; diff --git a/frappe/website/doctype/web_page/web_page_list.js b/frappe/website/doctype/web_page/web_page_list.js index 851f48187b..a9eff7f358 100644 --- a/frappe/website/doctype/web_page/web_page_list.js +++ b/frappe/website/doctype/web_page/web_page_list.js @@ -4,7 +4,7 @@ frappe.listview_settings['Web Page'] = { if(doc.published) { return [__("Published"), "green", "published,=,Yes"]; } else { - return [__("Not Published"), "darkgrey", "published,=,Yes"]; + return [__("Not Published"), "darkgray", "published,=,Yes"]; } } }; diff --git a/frappe/workflow/doctype/workflow/workflow_list.js b/frappe/workflow/doctype/workflow/workflow_list.js index bc3a5725da..038e2ffdfb 100644 --- a/frappe/workflow/doctype/workflow/workflow_list.js +++ b/frappe/workflow/doctype/workflow/workflow_list.js @@ -4,7 +4,7 @@ frappe.listview_settings['Workflow'] = { if(doc.is_active) { return [__("Active"), "green", "is_active,=,Yes"]; } else if(!doc.is_active) { - return [__("Not active"), "darkgrey", "is_active,=,No"]; + return [__("Not active"), "darkgray", "is_active,=,No"]; } } }; diff --git a/frappe/www/404.html b/frappe/www/404.html index dc178dbdc8..d41c847ddb 100644 --- a/frappe/www/404.html +++ b/frappe/www/404.html @@ -20,7 +20,7 @@ html, body {
{{_("The page you are looking for is missing. This could be because it is moved or there is a typo in the link.")}}
diff --git a/frappe/www/login.html b/frappe/www/login.html index 9d00892b18..927f3e9026 100644 --- a/frappe/www/login.html +++ b/frappe/www/login.html @@ -83,7 +83,7 @@ {%- else -%}{{_("Signups have been disabled for this website.")}}