Merge pull request #310 from pateljannat/minor-fixes

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",

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
   },
   {

school/lms/web_template/courses_enrolled/courses_enrolled.html

@@ -15,16 +15,20 @@
   {% else %}
   {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
   <div class="empty-state">
-    <div class="course-home-headings text-center mb-0" style="color: inherit;">You haven't enrolled for any courses</div>
+    <div class="empty-state-text">
-    <p class="small text-center mb-8">Here are a few courses we recommend for you to get started with {{ site_name }}</p>
+      <div class="text-center">
-    {% set recommended_courses = [course1, course2, course3] %}
+        <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
-    <div class="cards-parent">
+        <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
-    {% for recommended_course in recommended_courses %}
+      </div>
-    {% if recommended_course %}
+      {% set recommended_courses = [course1, course2, course3] %}
-    {% set course_details = frappe.get_doc("LMS Course", recommended_course) %}
+      <div class="cards-parent">
-    {{ widgets.CourseCard(course=course_details) }}
+      {% for recommended_course in recommended_courses %}
-    {% endif %}
+      {% if recommended_course %}
-    {% endfor %}
+      {% set course_details = frappe.get_doc("LMS Course", recommended_course) %}
+      {{ widgets.CourseCard(course=course_details) }}
+      {% endif %}
+      {% endfor %}
+      </div>
     </div>
   </div>
   {% endif %}

school/lms/widgets/Reviews.html

@@ -83,7 +83,7 @@
   </div>
 
   {% else %}
-  <div class="empty-state-new">
+  <div class="empty-state">
     <div>
       <img class="icon icon-xl" src="/assets/school/icons/comment.svg">
     </div>

school/public/css/style.css

@@ -927,14 +927,6 @@ pre {
 }
 
 .empty-state {
-  background: #EBEEF0;
-  border: 1px dashed #C8CFD5;
-  box-sizing: border-box;
-  border-radius: var(--border-radius-md);
-  padding: 2.5rem;
-}
-
-.empty-state-new {
   background: var(--gray-50);
   border-radius: var(--border-radius-lg);
   padding: 2rem;
@@ -1069,10 +1061,10 @@ pre {
 }
 
 .search-empty-state {
-  text-align: center;
   position: relative;
-  top: 4rem;
+  top: 1rem;
   margin-bottom: 5rem;
+  width: 100%;
 }
 
 .close-search-empty-state {

school/templates/quiz.html

@@ -1,7 +1,5 @@
 <div id="quiz-title" class="course-home-headings">{{ quiz.title }}</div>
 
-<div class="card-divider"></div>
-
 <div class="common-card-style question-card">
   <form id="quiz-form">
     <div class="questions">

school/templates/search_course/search_course.html

@@ -4,11 +4,15 @@
 {% if show_search %}
 <input class="search" id="search-course" placeholder="{{ _(search_placeholder) }}">
 
-<div id="" class="alert alert-dismissible empty-state search-empty-state hide">
+<div class="empty-state alert alert-dismissible search-empty-state hide">
   <a href="#" class="close-search-empty-state" aria-label="close">&times;</a>
-  <img class="icon icon-xl" src="/assets/frappe/images/ui-states/search-empty-state.svg">
+  <div>
-  <div class="course-home-headings mt-4 mb-0" style="color: inherit;"> {{ _("No results found") }} </div>
+    <img class="icon icon-xl" src="/assets/frappe/images/ui-states/search-empty-state.svg">
-  <div class="small mb-6"> {{ _("Try some other keyword or explore our list of courses.") }} </div>
+  </div>
+  <div class="empty-state-text">
+    <div class="empty-state-heading">{{ _("No results found") }}</div>
+    <div class="course-meta">{{ _("Try some other keyword or explore our list of courses.") }}</div>
+  </div>
 </div>
 
 <script> {% include "school/templates/search_course/search_course.js" %} </script>

school/www/community/index.html

@@ -9,11 +9,15 @@
 
     <div class="course-home-headings">{{ _("Community") }} </div>
 
-    <div class="alert alert-dismissible empty-state text-center hide" id="search-empty-state">
+    <div class="empty-state alert alert-dismissible hide" id="search-empty-state">
       <a href="#" class="close-search-empty-state" aria-label="close">&times;</a>
-      <img class="icon icon-xl" src="/assets/frappe/images/ui-states/search-empty-state.svg">
+      <div>
-      <div class="course-home-headings mt-4 mb-0" style="color: inherit;"> {{ _("No results found") }} </div>
+        <img class="icon icon-xl" src="/assets/frappe/images/ui-states/search-empty-state.svg">
-      <div class="small mb-6"> {{ _("Try some other keyword or explore our community") }} </div>
+      </div>
+      <div class="empty-state-text">
+        <div class="empty-state-heading">{{ _("No results found") }}</div>
+        <div class="course-meta">{{ _("Try some other keyword or explore our community") }}</div>
+      </div>
     </div>
 
     <div class="member-parent">

school/www/jobs/index.html

@@ -40,13 +40,20 @@
     </div>
       </div>
     {% else %}
-    <div class="empty-state text-center">
+
-      <img class="icon icon-xl" src="/assets/frappe/icons/timeless/message.svg">
+    <div class="empty-state">
-      <div class="course-home-headings mt-4 mb-0" style="color: inherit;"> {{ _("No open jobs") }} </div>
+      <div>
-      <div class="small mb-6"> {{ _("There are no job openings at present.") }} </div>
+        <img class="icon icon-xl" src="/assets/school/icons/comment.svg">
-      {% if allow_posting %}
+      </div>
-      <a class="button is-secondary dark-links m-auto" href="/job-opportunity?new=1">{{ _("Post a Job") }}</a>
+      <div class="empty-state-text">
-      {% endif %}
+        <div class="empty-state-heading">{{ _("No open jobs") }}</div>
+        <div class="course-meta">{{ _("There are no job openings at present.") }}</div>
+      </div>
+      <div>
+        {% if allow_posting %}
+        <a class="button is-secondary dark-links m-auto" href="/job-opportunity?new=1">{{ _("Post a Job") }}</a>
+        {% endif %}
+      </div>
     </div>
     {% endif %}
   </div>