Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: [FC-0070] rendering library content in unit page #35785

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+107 −24
Open

feat: [FC-0070] rendering library content in unit page #35785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions cms/static/js/views/pages/container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ function($, _, Backbone, gettext, BasePage,
'click .manage-tags-button': 'openManageTags',
'change .header-library-checkbox': 'toggleLibraryComponent',
'click .collapse-button': 'collapseXBlock',
'click .xblock-view-action-button': 'viewXBlockContent',
},

options: {
Expand Down Expand Up @@ -717,10 +718,6 @@ function($, _, Backbone, gettext, BasePage,
this.deleteComponent(this.findXBlockElement(event.target));
},

createPlaceholderElement: function() {
return $('<div/>', {class: 'studio-xblock-wrapper'});
},
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[question]: Is this method necessary for the legacy functionality to work correctly? Should we remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a duplicated method in the file. https://github.com/openedx/edx-platform/pull/35785/files/7e3ef8a3ce97fa588a7296c9dad16eacd7d1883a#diff-1b7855448b6086c2a313e0b9ecff179e991106aac52648d880f6f9d551e64577L585


createComponent: function(template, target) {
// A placeholder element is created in the correct location for the new xblock
// and then onNewXBlock will replace it with a rendering of the xblock. Note that
Expand Down Expand Up @@ -814,6 +811,25 @@ function($, _, Backbone, gettext, BasePage,
}
},

viewXBlockContent: function(event) {
try {
if (this.options.isIframeEmbed) {
event.preventDefault();
window.parent.postMessage(
{
type: 'handleViewXBlockContent',
payload: {
destination: event.currentTarget.href || '',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer if we can also send the usageId as a separate parameter in the payload here, instead of making the MFE parse it (const newUnitId = payload.destination.split('/').pop()).

},
}, document.referrer
);
return true;
}
} catch (e) {
console.error(e);
}
},

toggleSaveButton: function() {
var $saveButton = $('.nav-actions .save-button');
if (JSON.stringify(this.selectedLibraryComponents.sort()) === JSON.stringify(this.storedSelectedLibraryComponents.sort())) {
Expand Down
100 changes: 81 additions & 19 deletions cms/static/sass/course-unit-mfe-iframe-bundle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
@import 'cms/theme/variables-v1';
@import 'elements/course-unit-mfe-iframe';

body {
min-width: 800px;
}

.wrapper {
.inner-wrapper {
max-width: 100%;
}

.wrapper-xblock {
background-color: $transparent;
border-radius: 6px;
border: none;

&:hover {
border-color: none;
border-color: transparent;
}

.xblock-header-primary {
Expand All @@ -23,6 +31,54 @@
}
}

.xblock-header-secondary {
border-radius: 0 0 4px 4px;

.actions-list .action-item .action-button {
border-radius: 4px;

&:hover {
background-color: $primary;
color: $white;
}
}
}

&.level-page .xblock-message {
padding: ($baseline * .75) ($baseline * 1.2);
border-radius: 0 0 4px 4px;

&.information {
color: $text-color;
background-color: $xblock-message-info-bg;
border-color: $xblock-message-info-border-color;
}

&.validation.has-warnings {
color: $black;
background-color: $xblock-message-warning-bg;
border-color: $xblock-message-warning-border-color;
border-top-width: 1px;

.icon {
color: $xblock-message-warning-border-color;
}
}

a {
color: $primary;
}
}

.xblock-author_view-library_content > .wrapper-xblock-message .xblock-message {
font-size: 16px;
line-height: 22px;
border-radius: 4px;
padding: ($baseline * 1.2);
box-shadow: 0 1px 2px rgba(0, 0, 0, .15), 0 1px 4px rgba(0, 0, 0, .15);
margin-bottom: ($baseline * 1.4);
}

&.level-element {
box-shadow: 0 2px 4px rgba(0, 0, 0, .15), 0 2px 8px rgba(0, 0, 0, .15);
margin: 0 0 ($baseline * 1.4) 0;
Expand All @@ -40,27 +96,33 @@
border-bottom-right-radius: 6px;
}

.wrapper-xblock .header-actions .actions-list .action-item .action-button {
@extend %button-styles;

color: $primary;

.fa-ellipsis-v {
font-size: $base-font-size;
.wrapper-xblock .header-actions .actions-list {
.action-actions-menu:last-of-type .nav-sub {
right: 120px;
}

&:hover {
background-color: $primary;
color: $white;
border-color: $transparent;
}
.action-item .action-button {
@extend %button-styles;

&:focus {
outline: 2px $transparent;
background-color: $transparent;
box-shadow: inset 0 0 0 2px $primary;
color: $primary;
border-color: $transparent;

.fa-ellipsis-v {
font-size: $base-font-size;
}

&:hover {
background-color: $primary;
color: $white;
border-color: $transparent;
}

&:focus {
outline: 2px $transparent;
background-color: $transparent;
box-shadow: inset 0 0 0 2px $primary;
color: $primary;
border-color: $transparent;
}
}
}

Expand Down Expand Up @@ -629,7 +691,7 @@ select {
}
}

.xblock-header-primary {
.xblock-header:not(.xblock-header-library_content, .xblock-header-split_test) .xblock-header-primary {
position: relative;

&::before {
Expand Down
5 changes: 5 additions & 0 deletions cms/static/sass/partials/cms/theme/_variables-v1.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,3 +313,8 @@ $light-background-color: #e1dddb !default;
$border-color: #707070 !default;
$base-font-size: 18px !default;
$dark: #212529;

$xblock-message-info-bg: #eff8fa;
$xblock-message-info-border-color: #9cd2e6;
$xblock-message-warning-bg: #fffdf0;
$xblock-message-warning-border-color: #fff6bf;
2 changes: 1 addition & 1 deletion cms/templates/studio_xblock_wrapper.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
<div class="meta-info">${_('This block contains multiple components.')}</div>
<ul class="actions-list">
<li class="action-item action-view">
<a href="${xblock_url}" class="action-button">
<a href="${xblock_url}" class="action-button xblock-view-action-button">
## Translators: this is a verb describing the action of viewing more details
<span class="action-button-text">${('View')}</span>
<span class="icon fa fa-arrow-right" aria-hidden="true"></span>
Expand Down
Loading