fix: ui and removed mockup

This commit is contained in:
pateljannat
2021-08-31 12:30:52 +05:30
parent 289195e6c9
commit f228489173
16 changed files with 49 additions and 699 deletions

View File

@@ -18,7 +18,8 @@
"fieldname": "title",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title"
"label": "Title",
"reqd": 1
},
{
"fieldname": "description",
@@ -30,7 +31,8 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Course",
"options": "LMS Course"
"options": "LMS Course",
"reqd": 1
},
{
"fieldname": "lessons",
@@ -55,7 +57,7 @@
"link_fieldname": "chapter"
}
],
"modified": "2021-08-19 13:43:51.025072",
"modified": "2021-08-31 10:43:45.866864",
"modified_by": "Administrator",
"module": "LMS",
"name": "Chapter",

View File

@@ -22,18 +22,21 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Chapter",
"options": "Chapter"
"options": "Chapter",
"reqd": 1
},
{
"fieldname": "title",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title"
"label": "Title",
"reqd": 1
},
{
"fieldname": "body",
"fieldtype": "Markdown Editor",
"label": "Body"
"label": "Body",
"reqd": 1
},
{
"fieldname": "index_label",
@@ -67,7 +70,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-07-27 16:28:29.203624",
"modified": "2021-08-31 10:44:14.168257",
"modified_by": "Administrator",
"module": "LMS",
"name": "Lesson",

View File

@@ -13,13 +13,14 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Lesson",
"options": "Lesson"
"options": "Lesson",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-07-27 16:53:52.732191",
"modified": "2021-08-31 10:44:42.048232",
"modified_by": "Administrator",
"module": "LMS",
"name": "Lessons",

View File

@@ -70,7 +70,7 @@
<a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
{% else %}
<div class="view-course-link">
<div class="view-course-link is-default">
View Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="/courses/{{ course.name }}"></a>

View File

@@ -1,3 +1,4 @@
{% if not course.upcoming %}
<div class="reviews-parent">
{% set reviews = course.get_reviews() %}
{% if reviews | length or course.is_eligible_to_review(membership) %}
@@ -35,6 +36,10 @@
</div>
{% endfor %}
</div>
{% else %}
<div class="common-card-style thread-card">
<span class="text-center"> No Reviews <img src="/assets/community/icons/slash.svg"></span>
</div>
{% endif %}
</div>
@@ -89,3 +94,4 @@
</div>
</div>
</div>
{% endif %}

View File

@@ -49,6 +49,15 @@
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "LMS Course Interest",
"link_to": "LMS Course Interest",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
@@ -121,7 +130,7 @@
"type": "Link"
}
],
"modified": "2021-06-29 15:11:07.324651",
"modified": "2021-08-31 10:33:39.838535",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS",

View File

@@ -32,107 +32,10 @@
--text-3xl: 22px;
}
body {
padding: 0px;
margin: 0px;
}
.chapter-plan {
border-radius: 10px;
margin: 20px 0px;
padding: 20px;
border: 1px solid #ddc;
background: white;
}
.chapter-plan h3 {
font-size: 1.1em;
font-weight: bold;
}
.batch {
border-radius: 10px;
margin: 10px 0px;
background: white;
box-shadow: 0px 5px 10px rgb(0 0 0 / 10%);
border: 1px solid #ddc;
}
.batch-details {
padding: 20px;
}
.batch .cta {
margin-top: 10px;
padding: 10px;
min-height: 28px;
text-align: right;
border-top: 1px solid #ddc;
}
.batch .right {
float: right;
}
img.profile-photo {
width: 24px;
height: 24px;
border-radius: 50%;
}
.lesson-type {
padding-right: 5px;
}
section {
padding: 5rem 0 5rem 0;
}
.batch-header {
background: #eee;
border: 2px solid #ddd;
}
.page-card {
max-width: 360px;
padding: 15px;
margin: 70px auto;
border: 1px solid #d1d8dd;
border-radius: 8px;
background-color: #fff;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1);
}
.page-card .page-card-head {
padding: 10px 15px;
margin: -15px;
margin-bottom: 15px;
border-bottom: 1px solid #d1d8dd;
}
.page-card .page-card-head .indicator {
color: #36414C;
font-size: 14px;
}
.page-card .page-card-head .indicator::before {
margin: 0 6px 0.5px 0px;
}
.page-card .btn {
margin-top: 30px;
}
input[type=checkbox] {
appearance: auto;
}
.progress-image {
margin-right: 3px;
border-radius: 50px;
padding: 5px;
}
.course-image {
height: 168px;
width: 100%;
@@ -272,13 +175,11 @@ input[type=checkbox] {
.view-course-link {
height: 32px;
background: var(--button-background);
border-radius: 4px;
font-size: 12px;
padding: 8px 0px 8px;
text-align: center;
line-height: 135%;
color: var(--text-color);
}
.cards-parent {
@@ -578,8 +479,8 @@ input[type=checkbox] {
}
.is-default {
background: #98A1A9;
color: #ffffff;
background: #F4F5F6;
color: #1F272E;
}
@media (max-width: 600px) {

View File

@@ -0,0 +1,4 @@
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 22C17.5228 22 22 17.5229 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5229 6.47715 22 12 22Z" stroke="#4C5A67" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M5 4.93005L19.14 19.0701" stroke="#4C5A67" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 428 B

View File

@@ -22,8 +22,8 @@
{% macro CourseCardWide(course) %}
<div class="common-card-style course-card-wide">
<div class="course-image-wide {% if not course.image %} default-image {% endif %}"
{% if course.image %}style="background-image: url({{ course.image }});"{% endif %}>
<div class="course-image-wide {% if not course.image %} default-image {% endif %}" {% if course.image
%}style="background-image: url({{ course.image }});" {% endif %}>
<div class="course-tags">
{% for tag in course.get_tags() %}
<div class="course-card-pills">{{ tag }}</div>
@@ -59,8 +59,8 @@
</a>
{% endif %}
{% if course.upcoming %}
<button class="button wide-button is-default" id="notify-me" data-course="{{course.name | urlencode}}"
{% if is_user_interested %} disabled="disabled" title="Your interest has already been noted." {% endif %} >
<button class="button wide-button is-default" id="notify-me" data-course="{{course.name | urlencode}}" {% if
is_user_interested %} disabled="disabled" title="Your interest has already been noted." {% endif %}>
Notify me when available
</button>
{% endif %}
@@ -70,10 +70,6 @@
<img class="ml-2" src="/assets/community/images/play.png" />
</div>
{% endif %}
{% set certificate = course.is_certified() %}
{% if certificate %}
<a class="button wide-button is-secondary dark-links" href="/courses/{{ course.name }}/{{ certificate }}">Get Certificate</a>
{% endif %}
</div>
</div>
</div>
@@ -101,6 +97,7 @@
<!-- Course Outline and Creator -->
{% macro CourseOutlineAndCreator(course) %}
{% set certificate = course.is_certified() %}
<div class="course-outline-instructor-parent">
<div class="course-home-outline">
{{ widgets.CourseOutline(course=course, membership=membership) }}
@@ -137,9 +134,13 @@
{{ frappe.utils.rounded(progress) }}%
</div>
<div class="progress">
<div class="progress-bar" role="progressbar" style="width: {{ progress }}%"
aria-valuenow="{{ progress }}" aria-valuemin="0" aria-valuemax="100"></div>
<div class="progress-bar" role="progressbar" style="width: {{ progress }}%" aria-valuenow="{{ progress }}"
aria-valuemin="0" aria-valuemax="100"></div>
</div>
{% if certificate %}
<a class="muted-text dark-links mt-5 text-center" href="/courses/{{ course.name }}/{{ certificate }}">Get
Certificate</a>
{% endif %}
</div>
</div>
{% endif %}