fix(UX): General UI fixes and changes (#6672)

* Rename Sign In to Login

* Init settings module view

* Replace 'Make' with 'Create'

* Add more settings options

* Remove POS setting

* Fix frontend test

* Change text of login head

* Change login head text

cypress/integration/login.js

@@ -4,7 +4,7 @@ context('Login', () => {
 	});
 
 	it('greets with login screen', () => {
-		cy.get('.page-card-head').contains('Sign In');
+		cy.get('.page-card-head').contains('Login');
 	});
 
 	it('validates password', () => {

frappe/config/desktop.py

@@ -80,5 +80,12 @@ def get_data():
 			"color": '#FF4136',
 			'standard': 1,
 			'idx': 15
+		},
+		{
+			"module_name": 'Settings',
+			"color": "#bdc3c7",
+			"reverse": 1,
+			"icon": "octicon octicon-settings",
+			"type": "module"
 		}
 	]

frappe/config/settings.py

@@ -0,0 +1,51 @@
+from frappe import _
+
+def get_data():
+	return [{
+		"label": _("Settings"),
+		"icon": "fa fa-wrench",
+		"items": [
+			{
+				"type": "doctype",
+				"name": "System Settings",
+				"label": _("System Settings"),
+				"description": _("Language, Date and Time settings"),
+				"hide_count": True
+			},
+			{
+				"type": "doctype",
+				"name": "Domain Settings",
+				"label": _("Domain Settings"),
+				"description": _("Enable / Disable Domains"),
+				"hide_count": True
+			},
+			{
+				"type": "doctype",
+				"name": "Print Settings",
+				"label": _("Print Settings"),
+				"description": _("Print Style, PDF Size"),
+				"hide_count": True
+			},
+			{
+				"type": "doctype",
+				"name": "Website Settings",
+				"label": _("Website Settings"),
+				"description": _("Landing Page, Website Theme, Brand Setup and more"),
+				"hide_count": True
+			},
+			{
+				"type": "doctype",
+				"name": "S3 Backup Settings",
+				"label": _("S3 Backup Settings"),
+				"description": _("Enable / Disable Backup, Backup Frequency"),
+				"hide_count": True
+			},
+			{
+				"type": "doctype",
+				"name": "SMS Settings",
+				"label": _("SMS Settings"),
+				"description": _("SMS Gateway URL, Message & Receiver Parameter"),
+				"hide_count": True
+			}
+		]
+	}]

frappe/desk/doctype/desktop_icon/desktop_icon.py

@@ -410,7 +410,7 @@ def get_user_icons(user):
 			add = False
 
 		if not icon.custom:
-			if icon.module_name=='Learn':
+			if icon.module_name==['Help', 'Settings']:
 				pass
 
 			elif icon.type=="page" and icon.link not in allowed_pages:

frappe/public/js/frappe/chat.js

@@ -1644,7 +1644,7 @@ class extends Component {
 							 ],
 							action: {
 								primary: {
-									   label: __("Create"),
+									   label: __('Create'),
 									onsubmit: (values) => {
 										if ( values.type === "Group" ) {
 											if ( !frappe._.is_empty(values.users) ) {

frappe/public/js/frappe/desk.js

@@ -618,7 +618,7 @@ frappe.get_desktop_icons = function(show_hidden, show_global) {
 			//out = frappe.model.can_read(m._doctype);
 			out = frappe.boot.user.can_read.includes(m._doctype);
 		} else {
-			if(m.module_name==='Learn') {
+			if(['Help', 'Settings'].includes(m.module_name)) {
 				// no permissions necessary for learn
 				out = true;
 			} else if(m.module_name==='Setup' && frappe.user.has_role('System Manager')) {

frappe/public/js/frappe/form/link_selector.js

@@ -103,7 +103,7 @@ frappe.ui.form.LinkSelector = Class.extend({
 				$('<p><br><span class="text-muted">' + __("No Results") + '</span>'
 					+ (frappe.model.can_create(me.doctype) ?
 						('<br><br><a class="new-doc btn btn-default btn-sm">'
-							+ __("Make a new {0}", [__(me.doctype)]) + "</a>") : '')
+							+ __('Create a new {0}', [__(me.doctype)]) + "</a>") : '')
 					+ '</p>').appendTo(parent).find(".new-doc").click(function () {
 						frappe.new_doc(me.doctype);
 					});
@@ -140,7 +140,7 @@ frappe.ui.form.LinkSelector = Class.extend({
 					]);
 				}
 			}, __("Set Quantity"), __("Set"));
-		} else if (me.dynamic_link_field) { 
+		} else if (me.dynamic_link_field) {
 			var d = me.target.add_new_row();
 			frappe.model.set_value(d.doctype, d.name, me.dynamic_link_field, me.dynamic_link_reference);
 			frappe.model.set_value(d.doctype, d.name, me.fieldname, value);

frappe/public/js/frappe/form/multi_select_dialog.js

@@ -55,7 +55,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			},
 			{ fieldtype: "Section Break" },
 			{ fieldtype: "HTML", fieldname: "results_area" },
-			{ fieldtype: "Button", fieldname: "make_new", label: __("Make a new " + me.doctype) }
+			{ fieldtype: "Button", fieldname: "make_new", label: __('Create a new ' + me.doctype) }
 		]);
 
 		let doctype_plural = !this.doctype.endsWith('y') ? this.doctype + 's'

frappe/public/js/frappe/list/list_renderer.js

@@ -621,7 +621,7 @@ frappe.views.ListRenderer = Class.extend({
 		var new_button = frappe.boot.user.can_create.includes(this.doctype)
 			? (`<p><button class='btn btn-primary btn-sm'
 				list_view_doc='${this.doctype}'>
-					${__('Make a new {0}', [__(this.doctype)])}
+					${__('Create a new {0}', [__(this.doctype)])}
 				</button></p>`)
 			: '';
 		var no_result_message =

frappe/public/js/frappe/list/list_view.js

@@ -272,7 +272,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	get_no_result_message() {
 		const new_button = this.can_create ?
 			`<p><button class="btn btn-primary btn-sm btn-new-doc">
-				${__('Make a new {0}', [__(this.doctype)])}
+				${__('Create a new {0}', [__(this.doctype)])}
 			</button></p>` : '';
 
 		return `<div class="msg-box no-border">

frappe/public/js/frappe/ui/toolbar/awesome_bar.js

@@ -129,7 +129,7 @@ frappe.search.AwesomeBar = Class.extend({
 			default: "Help",
 			onclick: function() {
 				var txt = '<table class="table table-bordered">\
-					<tr><td style="width: 50%">'+__("Make a new record")+'</td><td>'+
+					<tr><td style="width: 50%">'+__('Create a new record')+'</td><td>'+
 						__("new type of document")+'</td></tr>\
 					<tr><td>'+__("List a document type")+'</td><td>'+
 						__("document type..., e.g. customer")+'</td></tr>\

frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js

@@ -115,7 +115,7 @@ frappe.setup.UserProgressDialog  = class UserProgressDialog {
 					.prepend($(`<a class="done-btn btn btn-default btn-sm">
 					${__("Mark as Done")}</a>`))
 					.append($(`<a class="make-btn btn btn-primary btn-sm primary action">
-					${__("Create")}</a>`));
+					${__('Create')}</a>`));
 			},
 			on_update: (completed, total) => {
 				let percent = completed * 100 / total;

frappe/public/js/frappe/views/interaction.js

@@ -15,7 +15,7 @@ frappe.views.InteractionComposer = class InteractionComposer {
 			title: (me.title || me.subject || __("New Activity")),
 			no_submit_on_enter: true,
 			fields: me.get_fields(),
-			primary_action_label: __("Create"),
+			primary_action_label: __('Create'),
 			primary_action: function() {
 				me.create_action();
 			}

frappe/public/js/frappe/views/reports/query_report.js

@@ -511,7 +511,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		const non_numeric_fields = columns.filter((col, i) => !indices.includes(i))
 
 		const dialog = new frappe.ui.Dialog({
-			title: __('Make Chart'),
+			title: __('Create Chart'),
 			fields: [
 				{
 					fieldname: 'y_field',
@@ -559,7 +559,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					fieldtype: 'HTML',
 				}
 			],
-			primary_action_label: __('Make'),
+			primary_action_label: __('Create'),
 			primary_action: (values) => {
 				let options = get_chart_options(values);
 

frappe/www/login.html

@@ -13,7 +13,7 @@
 	<div class="login-content page-card" style="margin-top: 30px;">
 		<form class="form-signin form-login" role="form">
 			<div class="page-card-head">
-				<span class="indicator blue" data-text="{{ _("Sign In") }}"></span>
+				<span class="indicator blue" data-text="{{ _("Login") }}"></span>
 			</div>
 
 			<input type="text" id="login_email"
@@ -26,7 +26,7 @@
 				class="form-control" placeholder="{{ _('Password') }}" required>
 
 			<button class="btn btn-sm btn-primary btn-block btn-login" type="submit">
-				{{ _("Sign in") }}</button>
+				{{ _("Login") }}</button>
 
 			{% if ldap_settings and ldap_settings.enabled %}
 			<button class="btn btn-sm btn-default btn-block btn-login btn-ldap-login">