Skip to content

Commit

Permalink
Merge pull request #77 from WisdmLabs/dev40
Browse files Browse the repository at this point in the history 
Merge dev40 to stable40
  • Loading branch information
@abhikushwah
abhikushwah authored Apr 17, 2023
2 parents ada3092 + 344ffde commit 07cc5ee
Show file tree
Hide file tree
Showing 9 changed files with 159 additions and 78 deletions.
5 changes: 5 additions & 0 deletions changes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
CHANGES LOG

Version 4.1.2
=============.
Tweak - UI improvements in Label activitity.
Tweak - Multilang support added in header in course page.

Version 4.1.1
=============
Fix - Input field editable text visibility when background image is available on section cards.
Expand Down
5 changes: 4 additions & 1 deletion classes/course_format_data_common_trait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,7 @@ public function course_section_cm_text(cm_info $mod, $displayoptions = array())
}
$content = $mod->get_formatted_content(array('overflowdiv' => true, 'noclean' => true));
list($linkclasses, $textclasses) = $this->course_section_cm_classes($mod);

if ($mod->url && $mod->uservisible) {
if ($content) {
// If specified, display extra content after link.
Expand Down Expand Up @@ -958,8 +959,10 @@ private function get_activities_details($section, $course, $courserenderer, $set
$settings
);
if ($mod->modname == 'label') {
$activitydetails->title = $activitydetails->summary;
$activitydetails->title .= $this->course_section_cm_text($mod, $displayoptions);
$activitydetails->displayasblock = true;
$activitydetails->summary = '';

}
} else {
$activitydetails->summary = '';
Expand Down
4 changes: 2 additions & 2 deletions lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,8 @@ function get_extra_header_context(&$export, $course, $percentage, $imgurl) {
}
$coursesettings = course_get_format($course)->get_settings();
$export->generalsection['teachers'] = get_enrolled_teachers_context_formate($course->id, true);
$export->generalsection['coursefullname'] = $coursedetails->fullname;
$export->generalsection['coursecategoryname'] = $categorydetails->name;
$export->generalsection['coursefullname'] = format_text($coursedetails->fullname);
$export->generalsection['coursecategoryname'] = format_text($categorydetails->name);
$export->generalsection['rnrdesign'] = $rnrshortdesign;
if (gettype($imgurl) != "object") {
$imgurl = formate_get_course_image($course);
Expand Down
20 changes: 20 additions & 0 deletions scss/card-layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
}
}
.activity {
&.label {
grid-column: 1/-1;
}
.title {
margin-bottom: 30px;
}
Expand Down Expand Up @@ -636,6 +639,23 @@
}
}
}
&.modtype_label{
grid-column: 1/-1 !important;
.single-card{
background-color: transparent;

.toggle-row-column{
display: none;
}
.completion-info{
display: flex;
justify-content: flex-end;
.btn{
width: fit-content;
}
}
}
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions scss/list-layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@

.modtype_label {
.contentwithoutlink {
max-height: 100%;
padding: 0px;
}
}
Expand Down
91 changes: 52 additions & 39 deletions scss/styles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,16 +437,60 @@ body#page-course-view-remuiformat {
margin: 0px;
max-width: unset;
.activity {
padding: $pad-24;
background: $white;
border: $border-height solid $light-border;
border-radius: $border-radius-8;
min-height: 350px;
transition: all 0.5s ease;
&:hover{
box-shadow: $card-box-shadow;
&:not(.modtype_label) {
padding: $pad-24;
background: $white;
border: $border-height solid $light-border;
border-radius: $border-radius-8;
min-height: 350px;
transition: all 0.5s ease;
&:hover{
box-shadow: $card-box-shadow;
}
.actions {
display: flex;
position: relative;
justify-content: start;
margin-top: $margin-8;
padding: 0px;

.spinner {
position: relative;
left: 0;
}

.cm_action_menu.actions {
margin: 0px;
width: 100%;
position: unset !important;
justify-content: flex-end;
}

.activity-information {
width: 100%;

.completion-info {
width: 100%;
float: left;

.btn {
width: 100%;
}
}
}
}
}

&.modtype_label {
grid-column: 1/-1;
text-align: left ;
.actions{
position: relative !important;
justify-content: flex-end;
align-items: center;
gap: 16px;
}
}
.activitytitle {
display: flex;
flex-direction: column;
Expand All @@ -466,38 +510,7 @@ body#page-course-view-remuiformat {
}
}

.actions {
display: flex;
position: relative;
justify-content: start;
margin-top: $margin-8;
padding: 0px;

.spinner {
position: relative;
left: 0;
}

.cm_action_menu.actions {
margin: 0px;
width: 100%;
position: unset;
justify-content: flex-end;
}

.activity-information {
width: 100%;

.completion-info {
width: 100%;
float: left;

.btn {
width: 100%;
}
}
}
}

.editing_move {
position: absolute;
Expand Down
103 changes: 71 additions & 32 deletions styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ body#page-course-view-remuiformat.editing .remui-format-card.single-section-form
margin-bottom: 1.5rem !important;
}

body#page-course-view-remuiformat.editing .remui-format-card.single-section-format .activity.label {
grid-column: 1/-1;
}

body#page-course-view-remuiformat.editing .remui-format-card.single-section-format .activity .title {
margin-bottom: 30px;
}
Expand Down Expand Up @@ -523,7 +527,6 @@ body#page-course-view-remuiformat .remui-format-card.single-section-format .acti
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity .editing_move {
position: relative;
width: -webkit-fit-content;
width: -moz-fit-content;
width: fit-content;
top: -15px;
left: -15px;
Expand Down Expand Up @@ -574,7 +577,6 @@ body#page-course-view-remuiformat .remui-format-card.single-section-format .acti
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity .completion-container .automatic-completion-conditions .badge,
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity .completion-container .automatic-completion-conditions .badge {
width: -webkit-fit-content;
width: -moz-fit-content;
width: fit-content;
}

Expand Down Expand Up @@ -662,6 +664,33 @@ body#page-course-view-remuiformat .remui-format-card.single-section-format .acti
display: none;
}

body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label,
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label {
grid-column: 1/-1 !important;
}

body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card,
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card {
background-color: transparent;
}

body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card .toggle-row-column,
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .toggle-row-column {
display: none;
}

body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card .completion-info,
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .completion-info {
display: flex;
justify-content: flex-end;
}

body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card .completion-info .btn,
body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .completion-info .btn {
width: -webkit-fit-content;
width: fit-content;
}

body#page-course-view-remuiformat .remui-format-card .contentwithoutlink {
padding: 0;
}
Expand Down Expand Up @@ -785,6 +814,7 @@ body#page-course-view-remuiformat.editing .remui-format-list.one-section-format
}

body#page-course-view-remuiformat .modtype_label .contentwithoutlink {
max-height: 100%;
padding: 0px;
}

Expand Down Expand Up @@ -974,7 +1004,6 @@ body#page-course-view-remuiformat .remui-format-list .sections .section ul.secti

body#page-course-view-remuiformat .remui-format-list .sections .section .right.side {
width: -webkit-max-content;
width: -moz-max-content;
width: max-content;
}

Expand Down Expand Up @@ -1374,7 +1403,6 @@ body#page-course-view-remuiformat .card-section-leftnav {
background-color: #0051F9;
border-radius: 5px;
height: -webkit-fit-content;
height: -moz-fit-content;
height: fit-content;
}

Expand Down Expand Up @@ -1438,7 +1466,6 @@ body#page-course-view-remuiformat .automatic-completion-conditions .badge {
background-color: #EBF0F9;
border-radius: 4px;
width: -webkit-fit-content;
width: -moz-fit-content;
width: fit-content;
}

Expand Down Expand Up @@ -1624,7 +1651,7 @@ body#page-course-view-remuiformat .course-content .sections #section-0 .general-
}
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) {
padding: 24px;
background: #fff;
border: 1px solid #EBF0F9;
Expand All @@ -1633,59 +1660,71 @@ body#page-course-view-remuiformat .course-content .sections #section-0 .general-
transition: all 0.5s ease;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:hover {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label):hover {
box-shadow: 0px 13px 37px rgba(92, 107, 121, 0.1);
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .activitytitle {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
gap: 16px;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .availabilityinfo .description-inner {
color: #4C5A73;
text-align: left;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .availabilityinfo .description-inner .icon {
margin: unset;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .actions {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions {
display: flex;
position: relative;
justify-content: start;
margin-top: 8px;
padding: 0px;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .actions .spinner {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .spinner {
position: relative;
left: 0;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .actions .cm_action_menu.actions {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .cm_action_menu.actions {
margin: 0px;
width: 100%;
position: unset;
position: unset !important;
justify-content: flex-end;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .actions .activity-information {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information {
width: 100%;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .actions .activity-information .completion-info {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information .completion-info {
width: 100%;
float: left;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .actions .activity-information .completion-info .btn {
body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information .completion-info .btn {
width: 100%;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity.modtype_label {
grid-column: 1/-1;
text-align: left;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity.modtype_label .actions {
position: relative !important;
justify-content: flex-end;
align-items: center;
gap: 16px;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .activitytitle {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
gap: 16px;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .availabilityinfo .description-inner {
color: #4C5A73;
text-align: left;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .availabilityinfo .description-inner .icon {
margin: unset;
}

body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity .editing_move {
Expand Down
Loading

0 comments on commit 07cc5ee

Please sign in to comment.