diff --git a/cypress/integration/awesome_bar.js b/cypress/integration/awesome_bar.js index cc4ae4f8e3..72d078a720 100644 --- a/cypress/integration/awesome_bar.js +++ b/cypress/integration/awesome_bar.js @@ -12,7 +12,7 @@ context("Awesome Bar", () => { beforeEach(() => { let txt = `Search or type a command (${ window.navigator.platform === "MacIntel" ? "⌘" : "Ctrl" - } + G)`; + } + K)`; cy.findByPlaceholderText(txt).as("awesome_bar"); cy.get("@awesome_bar").type("{selectall}"); }); diff --git a/frappe/email/doctype/email_group/email_group.json b/frappe/email/doctype/email_group/email_group.json index 9f3ef47d32..9a201cba91 100644 --- a/frappe/email/doctype/email_group/email_group.json +++ b/frappe/email/doctype/email_group/email_group.json @@ -9,7 +9,6 @@ "engine": "InnoDB", "field_order": [ "title", - "column_break_oyyj", "total_subscribers", "sign_up_and_confirmation_section", "confirmation_email_template", @@ -46,10 +45,6 @@ "label": "Welcome Email Template", "options": "Email Template" }, - { - "fieldname": "column_break_oyyj", - "fieldtype": "Column Break" - }, { "fieldname": "sign_up_and_confirmation_section", "fieldtype": "Section Break", @@ -78,7 +73,7 @@ "link_fieldname": "email_group" } ], - "modified": "2024-03-23 16:03:24.125724", + "modified": "2024-09-25 15:24:37.576084", "modified_by": "Administrator", "module": "Email", "name": "Email Group", diff --git a/frappe/public/icons/timeless/icons.svg b/frappe/public/icons/timeless/icons.svg index e2e2d7c270..843fb536b2 100644 --- a/frappe/public/icons/timeless/icons.svg +++ b/frappe/public/icons/timeless/icons.svg @@ -258,6 +258,10 @@ Tip: use lucide.svg in /icons for all downloaded icons fill="#E24C4C"> + + + + diff --git a/frappe/public/images/ui-states/404.png b/frappe/public/images/ui-states/404.png deleted file mode 100644 index 1cbf7eeee0..0000000000 Binary files a/frappe/public/images/ui-states/404.png and /dev/null differ diff --git a/frappe/public/js/frappe/ui/keyboard.js b/frappe/public/js/frappe/ui/keyboard.js index a0d3cb7f5c..ef44f185dc 100644 --- a/frappe/public/js/frappe/ui/keyboard.js +++ b/frappe/public/js/frappe/ui/keyboard.js @@ -187,6 +187,7 @@ frappe.ui.keys.off = function (key, page) { frappe.ui.keys.add_shortcut({ shortcut: "ctrl+s", action: function (e) { + document.activeElement?.blur(); frappe.app.trigger_primary_action(); e.preventDefault(); return false; @@ -205,6 +206,16 @@ frappe.ui.keys.add_shortcut({ description: __("Open Awesomebar"), }); +frappe.ui.keys.add_shortcut({ + shortcut: "ctrl+k", + action: function (e) { + $("#navbar-search").focus(); + e.preventDefault(); + return false; + }, + description: __("Open Awesomebar"), +}); + frappe.ui.keys.add_shortcut({ shortcut: "ctrl+h", action: function (e) { diff --git a/frappe/public/js/frappe/ui/sidebar.js b/frappe/public/js/frappe/ui/sidebar.js index a79792132c..f74a981146 100644 --- a/frappe/public/js/frappe/ui/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar.js @@ -154,7 +154,7 @@ frappe.ui.Sidebar = class Sidebar { { app_name: "website", app_title: __("Website"), - app_home: "/", + app_route: "/", app_logo_url: "/assets/frappe/images/web.svg", }, app_switcher_menu diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index 3b056c91ec..80faa0a170 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -26,7 +26,7 @@ id="navbar-search" type="text" class="form-control" - placeholder="{%= __('Search or type a command ({0})', [frappe.utils.is_mac() ? '⌘ + G' : 'Ctrl + G']) %}" + placeholder="{%= __('Search or type a command ({0})', [frappe.utils.is_mac() ? '⌘ + K' : 'Ctrl + K']) %}" aria-haspopup="true" > diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js index 4c9356327e..2a39a0d704 100644 --- a/frappe/public/js/frappe/views/breadcrumbs.js +++ b/frappe/public/js/frappe/views/breadcrumbs.js @@ -76,7 +76,7 @@ frappe.breadcrumbs = { if ( breadcrumbs.workspace && - frappe.workspace_map[breadcrumbs.workspace].app != frappe.current_app + frappe.workspace_map[breadcrumbs.workspace]?.app != frappe.current_app ) { frappe.app.sidebar.set_current_app(frappe.workspace_map[breadcrumbs.workspace].app); } diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss index 6012c8a7f0..5e260dd90e 100644 --- a/frappe/public/scss/common/grid.scss +++ b/frappe/public/scss/common/grid.scss @@ -243,7 +243,7 @@ } textarea { - height: 46px !important; + height: 39px !important; } .form-control, diff --git a/frappe/public/scss/website/error-state.scss b/frappe/public/scss/website/error-state.scss index ce4a6a0d8c..b278d73d33 100644 --- a/frappe/public/scss/website/error-state.scss +++ b/frappe/public/scss/website/error-state.scss @@ -1,17 +1,24 @@ .error-page { - margin: 3rem 0; - text-align: center; + height: 100vh; + display: flex; + align-items: center; + justify-content: center; - .img-404 { - width: 40%; - margin: var(--margin-2xl) auto; - - @include media-breakpoint-down(sm) { - width: 80%; - } + p, + h4 { + color: var(--text-light); } - .back-to-home { - @include get_textstyle("base", "regular"); + h4 { + text-align: center; + margin-top: 0px; + } + + .details { + border-top: 1px solid var(--border-color); + margin-top: var(--margin-md); + padding-top: var(--padding-md); + max-width: 800px; + text-align: center; } } diff --git a/frappe/templates/web.html b/frappe/templates/web.html index 48fbce7cd1..652c62d760 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -13,7 +13,7 @@ {% block page_container %} -
+
{% block header %}{% endblock %} diff --git a/frappe/www/404.html b/frappe/www/404.html index 2596741c7a..52cc5b73ae 100644 --- a/frappe/www/404.html +++ b/frappe/www/404.html @@ -2,22 +2,29 @@ {%- block title -%}{{_("Not Found")}}{%- endblock -%} +{% block navbar %}{% endblock %} +{% block footer %}{% endblock %} + {% block page_content %} +
-
-

- {{ _("There's nothing here") }} -

-
- {{ _("The page you are looking for has gone missing.") }} +

+ {{ _("Page not found") }} +

+
+ {{ _("Back to Home") }}
-
{{ _("Back to Home") }}
diff --git a/frappe/www/error.html b/frappe/www/error.html index 853287ff24..3ece9573a0 100644 --- a/frappe/www/error.html +++ b/frappe/www/error.html @@ -6,44 +6,50 @@ {% endblock -%} +{% block navbar %}{% endblock %} +{% block footer %}{% endblock %} {% block page_content %} - -
-
- {{ error_title }} -
-

{{ error_message }}

+ +
- {{ _("Home") }} +

+ {{ _("Error: {0}").format(http_status_code) }} +

+
+

{{ error_message }}

+ + + + + +
-

- {{ _("Error Code: {0}").format(http_status_code) }} -

-
-

- If you don't know what just happened, and wish to file a ticket - please
copy the error below and share it. -

-
-
- 
{{ error }}
-
{% endblock %} {% block script %} diff --git a/frappe/www/message.html b/frappe/www/message.html index 244675d9f5..1b7870d125 100644 --- a/frappe/www/message.html +++ b/frappe/www/message.html @@ -1,44 +1,35 @@ {% extends "templates/web.html" %} {% block title %}{{ title or _("Message") }}{% endblock %} +{% block navbar %}{% endblock %} +{% block footer %}{% endblock %} {% block page_content %} -
-
- - {{ title or _("Message") }} -
-
- {% block message_body %} - {% if message %} -

{{ message }}

- {% endif %} - {% if primary_action %} - - {% endif %} - {% endblock %} +
+
+

{{ title or _("Message") }}

+
+ {% block message_body %} + {% if message %} +

{{ message }}

+ {% if error_code %} +

{{ _("Status: {0}").format(error_code) }}

+ {% endif %} + {% endif %} + {% if primary_action %} + + {% endif %} + {% endblock %} +
-{% if error_code %} -

{{ _("Status: {0}").format(error_code) }}

-{% endif %} -{% endblock %} diff --git a/frappe/www/search.py b/frappe/www/search.py deleted file mode 100644 index 9c2fa4a11c..0000000000 --- a/frappe/www/search.py +++ /dev/null @@ -1,63 +0,0 @@ -import markupsafe - -import frappe -from frappe import _ -from frappe.core.utils import html2text -from frappe.utils import sanitize_html -from frappe.utils.global_search import web_search - - -def get_context(context): - context.no_cache = 1 - if frappe.form_dict.q: - query = str(markupsafe.escape(sanitize_html(frappe.form_dict.q))) - context.title = _("Search Results for") - context.query = query - context.route = "/search" - context.update(get_search_results(query, frappe.utils.sanitize_html(frappe.form_dict.scope))) - else: - context.title = _("Search") - - -@frappe.whitelist(allow_guest=True) -def get_search_results(text: str, scope: str | None = None, start: int = 0, as_html: bool = False): - results = web_search(text, scope, start, limit=21) - out = frappe._dict() - - if len(results) == 21: - out.has_more = 1 - results = results[:20] - - for d in results: - try: - d.content = html2text(d.content) - index = d.content.lower().index(text.lower()) - d.content = ( - d.content[:index] - + "" - + d.content[index:][: len(text)] - + "" - + d.content[index + len(text) :] - ) - - if index < 40: - start = 0 - prefix = "" - else: - start = index - 40 - prefix = "..." - - suffix = "" - if (index + len(text) + 47) < len(d.content): - suffix = "..." - - d.preview = prefix + d.content[start : start + len(text) + 87] + suffix - except Exception: - d.preview = html2text(d.content)[:97] + "..." - - out.results = results - - if as_html: - out.results = frappe.render_template("templates/includes/search_result.html", out) - - return out diff --git a/frappe/www/unsubscribe.html b/frappe/www/unsubscribe.html index 09c9d49ab9..1a4ede3a55 100644 --- a/frappe/www/unsubscribe.html +++ b/frappe/www/unsubscribe.html @@ -2,93 +2,102 @@ {% block title %} Unsubscribe from Newsletter {% endblock %} +{% block navbar %}{% endblock %} +{% block footer %}{% endblock %} + {% block page_content %} + - + $("#unselect-all-btn").click(function() { + $(".group").prop('checked', false); + }); + }); + - {% if status == "waiting_for_confirmation" %} - -
-
- Unsubscribe -
- {% if email_groups %} -
- Select groups you wish to unsubscribe from. - {{ email }} -
- - {% if email_groups|length > 5 %} - - - {% endif %} +{% if status == "waiting_for_confirmation" %} + +
+
+
{{_("Unsubscribe")}}
+
Select groups you wish to unsubscribe from ({{ email }})
+ + {% if email_groups|length > 5 %} + + + {% endif %} +
+ {% if email_groups %}
-