{% block header %}{% endblock %}
diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py
index 8190dbafdf..180b685638 100644
--- a/frappe/tests/test_search.py
+++ b/frappe/tests/test_search.py
@@ -5,11 +5,8 @@ import re
from functools import partial
import frappe
-from frappe.app import make_form_dict
from frappe.desk.search import get_names_for_mentions, search_link, search_widget
from frappe.tests.utils import FrappeTestCase
-from frappe.utils import set_request
-from frappe.website.serve import get_response
class TestSearch(FrappeTestCase):
@@ -251,21 +248,3 @@ def teardown_test_link_field_order(TestCase):
)
TestCase.tree_doc.delete()
-
-
-class TestWebsiteSearch(FrappeTestCase):
- def get(self, path, user="Guest"):
- frappe.set_user(user)
- set_request(method="GET", path=path)
- make_form_dict(frappe.local.request)
- response = get_response()
- frappe.set_user("Administrator")
- return response
-
- def test_basic_search(self):
- no_search = self.get("/search")
- self.assertEqual(no_search.status_code, 200)
-
- response = self.get("/search?q=b")
- self.assertEqual(response.status_code, 200)
- self.assertIn("Search Results", response.get_data(as_text=True))
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 %}
+
- 
-
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 %}
-
-- {{ _("There's nothing here") }} -
-
- {{ _("The page you are looking for has gone missing.") }}
+
+ {{ _("Page not found") }} +
+ -
-
-
- {{ 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. -
-
-
{% 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 %}
-{{ error }}
-
- - {{ title or _("Message") }} -
-
- {% block message_body %}
- {% if message %}
-
{{ message }}
- {% endif %} - {% if primary_action %} - - {% endif %} - {% endblock %} +
+
-{% if error_code %}
-
+
{{ title or _("Message") }}
+
+ {% block message_body %}
+ {% if message %}
+
{{ message }}
+ {% if error_code %} +{{ _("Status: {0}").format(error_code) }}
+ {% endif %} + {% endif %} + {% if primary_action %} + + {% endif %} + {% endblock %} +{{ _("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..e3c59c8016 100644 --- a/frappe/www/unsubscribe.html +++ b/frappe/www/unsubscribe.html @@ -2,93 +2,106 @@ {% 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" %}
+
+
+
+
+ {% if email_groups %}
{{_("Unsubscribe")}}
+ Select groups you wish to unsubscribe from ({{ email }})
+
+ {% if email_groups|length > 5 %}
+
+
+ {% endif %}
+