From bcd80b616d90e956beb7851f26647440efca70a2 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 24 Feb 2022 12:40:13 +0530 Subject: [PATCH] fix: empty states redesign and misc changes --- .../job_opportunity/job_opportunity.json | 9 ++++--- .../job_opportunity/job_opportunity.json | 9 ++++--- .../courses_enrolled/courses_enrolled.html | 26 +++++++++++-------- school/public/css/style.css | 4 +-- school/templates/quiz.html | 2 -- .../search_course/search_course.html | 12 ++++++--- school/www/community/index.html | 12 ++++++--- school/www/jobs/index.html | 21 ++++++++++----- 8 files changed, 57 insertions(+), 38 deletions(-) diff --git a/school/job/doctype/job_opportunity/job_opportunity.json b/school/job/doctype/job_opportunity/job_opportunity.json index 6397d2a1..aa712661 100644 --- a/school/job/doctype/job_opportunity/job_opportunity.json +++ b/school/job/doctype/job_opportunity/job_opportunity.json @@ -2,7 +2,7 @@ "actions": [], "allow_rename": 1, "autoname": "format: JOB-{#####}", - "creation": "2021-12-27 16:53:32.316215", + "creation": "2022-02-07 12:01:41.074418", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", @@ -95,7 +95,8 @@ { "fieldname": "company_logo", "fieldtype": "Attach Image", - "label": "Company Logo" + "label": "Company Logo", + "reqd": 1 }, { "fieldname": "application_link", @@ -112,7 +113,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2022-01-11 14:56:42.509351", + "modified": "2022-02-24 12:37:45.666484", "modified_by": "Administrator", "module": "Job", "name": "Job Opportunity", @@ -150,4 +151,4 @@ "sort_order": "DESC", "states": [], "title_field": "job_title" -} \ No newline at end of file +} diff --git a/school/job/web_form/job_opportunity/job_opportunity.json b/school/job/web_form/job_opportunity/job_opportunity.json index c74aec74..a8f1e611 100644 --- a/school/job/web_form/job_opportunity/job_opportunity.json +++ b/school/job/web_form/job_opportunity/job_opportunity.json @@ -16,10 +16,11 @@ "docstatus": 0, "doctype": "Web Form", "idx": 0, + "is_multi_step_form": 0, "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-12-30 12:09:22.469041", + "modified": "2022-02-24 11:31:25.290524", "modified_by": "Administrator", "module": "Job", "name": "job-opportunity", @@ -76,10 +77,10 @@ { "allow_read_on_all_link_options": 0, "default": "Open", - "fieldname": "job_opportunity_status", + "fieldname": "status", "fieldtype": "Select", "hidden": 0, - "label": "Job Opportunity Status", + "label": "Status", "max_length": 0, "max_value": 0, "options": "Open\nClosed", @@ -120,7 +121,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { diff --git a/school/lms/web_template/courses_enrolled/courses_enrolled.html b/school/lms/web_template/courses_enrolled/courses_enrolled.html index b0dc295e..9fa5f832 100644 --- a/school/lms/web_template/courses_enrolled/courses_enrolled.html +++ b/school/lms/web_template/courses_enrolled/courses_enrolled.html @@ -14,17 +14,21 @@ {% else %} {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %} -
-
You haven't enrolled for any courses
-

Here are a few courses we recommend for you to get started with {{ site_name }}

- {% set recommended_courses = [course1, course2, course3] %} -
- {% for recommended_course in recommended_courses %} - {% if recommended_course %} - {% set course_details = frappe.get_doc("LMS Course", recommended_course) %} - {{ widgets.CourseCard(course=course_details) }} - {% endif %} - {% endfor %} +
+
+
+
{{ _("You haven't enrolled for any courses") }}
+
{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}
+
+ {% set recommended_courses = [course1, course2, course3] %} +
+ {% for recommended_course in recommended_courses %} + {% if recommended_course %} + {% set course_details = frappe.get_doc("LMS Course", recommended_course) %} + {{ widgets.CourseCard(course=course_details) }} + {% endif %} + {% endfor %} +
{% endif %} diff --git a/school/public/css/style.css b/school/public/css/style.css index 4a2fe08b..16c6a8ad 100644 --- a/school/public/css/style.css +++ b/school/public/css/style.css @@ -1069,10 +1069,10 @@ pre { } .search-empty-state { - text-align: center; position: relative; - top: 4rem; + top: 1rem; margin-bottom: 5rem; + width: 100%; } .close-search-empty-state { diff --git a/school/templates/quiz.html b/school/templates/quiz.html index 3b517d47..5d5bf5bd 100644 --- a/school/templates/quiz.html +++ b/school/templates/quiz.html @@ -1,7 +1,5 @@
{{ quiz.title }}
-
-
diff --git a/school/templates/search_course/search_course.html b/school/templates/search_course/search_course.html index 1590ffec..c871ee19 100644 --- a/school/templates/search_course/search_course.html +++ b/school/templates/search_course/search_course.html @@ -4,11 +4,15 @@ {% if show_search %} -
+
× - -
{{ _("No results found") }}
-
{{ _("Try some other keyword or explore our list of courses.") }}
+
+ +
+
+
{{ _("No results found") }}
+
{{ _("Try some other keyword or explore our list of courses.") }}
+
diff --git a/school/www/community/index.html b/school/www/community/index.html index 1414092f..36949c9e 100644 --- a/school/www/community/index.html +++ b/school/www/community/index.html @@ -9,11 +9,15 @@
{{ _("Community") }}
-
+
× - -
{{ _("No results found") }}
-
{{ _("Try some other keyword or explore our community") }}
+
+ +
+
+
{{ _("No results found") }}
+
{{ _("Try some other keyword or explore our community") }}
+
diff --git a/school/www/jobs/index.html b/school/www/jobs/index.html index 9e563675..b10e3352 100644 --- a/school/www/jobs/index.html +++ b/school/www/jobs/index.html @@ -40,13 +40,20 @@
{% else %} -
- -
{{ _("No open jobs") }}
-
{{ _("There are no job openings at present.") }}
- {% if allow_posting %} - {{ _("Post a Job") }} - {% endif %} + +
+
+ +
+
+
{{ _("No open jobs") }}
+
{{ _("There are no job openings at present.") }}
+
+
+ {% if allow_posting %} + {{ _("Post a Job") }} + {% endif %} +
{% endif %}