Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions assets/blocks/lesson-action-blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
CompleteLessonBlock,
LessonActionsBlock,
LessonCompletedBlock,
PreviousLessonBlock,
NextLessonBlock,
TakeQuizBlock,
ResetLessonBlock,
Expand All @@ -15,6 +16,7 @@ registerSenseiBlocks( [
LessonActionsBlock,
LessonCompletedBlock,
CompleteLessonBlock,
PreviousLessonBlock,
NextLessonBlock,
TakeQuizBlock,
ResetLessonBlock,
Expand Down
1 change: 1 addition & 0 deletions assets/blocks/lesson-actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
export { default as LessonActionsBlock } from './lesson-actions-block';
export { default as CompleteLessonBlock } from './complete-lesson-block';
export { default as PreviousLessonBlock } from './previous-lesson-block';
export { default as NextLessonBlock } from './next-lesson-block';
export { default as ResetLessonBlock } from './reset-lesson-block';
export { default as TakeQuizBlock } from './take-quiz-block';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export const ACTION_BLOCKS = [
'sensei-lms/button-complete-lesson',
'sensei-lms/button-view-quiz',
'sensei-lms/button-lesson-completed',
'sensei-lms/button-previous-lesson',
'sensei-lms/button-next-lesson',
'sensei-lms/button-reset-lesson',
];
Expand All @@ -14,6 +15,9 @@ export const BLOCKS_DEFAULT_ATTRIBUTES = {
'sensei-lms/button-lesson-completed': {
inContainer: true,
},
'sensei-lms/button-previous-lesson': {
inContainer: true,
},
'sensei-lms/button-next-lesson': {
inContainer: true,
},
Expand All @@ -35,11 +39,13 @@ export const IN_PROGRESS_PREVIEW = 'in-progress';

export const PREVIEW_STATE = {
[ COMPLETED_PREVIEW ]: [
'sensei-lms/button-previous-lesson',
'sensei-lms/button-next-lesson',
'sensei-lms/button-lesson-completed',
'sensei-lms/button-reset-lesson',
],
[ IN_PROGRESS_PREVIEW ]: [
'sensei-lms/button-previous-lesson',
'sensei-lms/button-view-quiz',
'sensei-lms/button-complete-lesson',
],
Expand Down
1 change: 1 addition & 0 deletions assets/blocks/lesson-actions/lesson-actions-block/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default {
innerBlocks: [
{ name: 'sensei-lms/button-lesson-completed' },
{ name: 'sensei-lms/button-complete-lesson' },
{ name: 'sensei-lms/button-previous-lesson' },
{ name: 'sensei-lms/button-next-lesson' },
{ name: 'sensei-lms/button-reset-lesson' },
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
&__preview-in-progress {
.wp-block-sensei-lms-button-reset-lesson,
.wp-block-sensei-lms-button-lesson-completed,
.wp-block-sensei-lms-button-prev-lesson,
.wp-block-sensei-lms-button-next-lesson {
opacity: 0.1;
}
Expand Down
40 changes: 40 additions & 0 deletions assets/blocks/lesson-actions/previous-lesson-block/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import { BlockStyles, createButtonBlockType } from '../../button';

/**
* Next lesson button block.
*/
export default createButtonBlockType( {
settings: {
name: 'sensei-lms/button-previous-lesson',
title: __( 'Previous Lesson', 'sensei-lms' ),
parent: [ 'sensei-lms/lesson-actions' ],
description: __(
'Enable a student to move to the previous lesson. This block is only displayed if there is a previous lesson has been completed.',
'sensei-lms'
),
keywords: [
__( 'Previous', 'sensei-lms' ),
__( 'Continue', 'sensei-lms' ),
__( 'Lesson', 'sensei-lms' ),
__( 'Button', 'sensei-lms' ),
],
attributes: {
text: {
default: __( 'Previous Lesson', 'sensei-lms' ),
},
},
styles: [
{ ...BlockStyles.Fill, isDefault: true },
BlockStyles.Outline,
BlockStyles.Link,
],
},
} );
69 changes: 45 additions & 24 deletions assets/course-theme/blocks/lesson-blocks/course-title/block.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,48 @@
{
"name": "sensei-lms/course-title",
"category": "theme",
"apiVersion": 2,
"supports": {
"align": true,
"color": true,
"spacing": {
"margin": true,
"padding": true,
"blockGap": true
},
"typography": {
"fontSize": true,
"lineHeight": true,
"__experimentalFontFamily": true,
"__experimentalFontWeight": true,
"__experimentalFontStyle": true,
"__experimentalTextTransform": true,
"__experimentalTextDecoration": true,
"__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
}
"name": "sensei-lms/course-title",
"title": "Course Title",
"category": "theme",
"apiVersion": 3,
"attributes": {
"content": {
"type": "rich-text",
"source": "rich-text",
"selector": "h1,h2,h3,h4,h5,h6",
"role": "content"
},
"level": {
"type": "number",
"default": 2
},
"levelOptions": {
"type": "array"
},
"className": {
"type": "string"
},
"placeholder": {
"type": "string"
}
},
"supports": {
"className": true,
"spacing": {
"margin": true,
"padding": true,
"blockGap": true
},
"typography": {
"fontSize": true,
"lineHeight": true,
"__experimentalFontFamily": true,
"__experimentalFontWeight": true,
"__experimentalFontStyle": true,
"__experimentalTextTransform": true,
"__experimentalTextDecoration": true,
"__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,56 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { useBlockProps } from '@wordpress/block-editor';
import { Platform } from '@wordpress/element';
import {
BlockControls,
RichText,
useBlockProps,
HeadingLevelDropdown,
useBlockEditingMode,
} from '@wordpress/block-editor';

export const CourseTitleEdit = () => {
const blockProps = useBlockProps();
export const CourseTitleEdit = ( {
attributes,
setAttributes,
mergeBlocks,
onReplace,
style,
} ) => {
const { content, level, levelOptions, className, placeholder } = attributes;
const tagName = 'h' + level;
const blockProps = useBlockProps( {
className,
style,
} );
const blockEditingMode = useBlockEditingMode();

// Todo: Add the heading level selection, similar to this https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/edit/index.js#L98-L103.
return <h2 { ...blockProps }>{ __( 'Course Title', 'sensei-lms' ) }</h2>;
return (
<>
{ blockEditingMode === 'default' && (
<BlockControls group="block">
<HeadingLevelDropdown
value={ level }
options={ levelOptions }
onChange={ ( newLevel ) =>
setAttributes( { level: newLevel } )
}
/>
</BlockControls>
) }
<RichText
identifier="content"
tagName={ tagName }
value={ content }
onMerge={ mergeBlocks }
onReplace={ onReplace }
onRemove={ () => onReplace( [] ) }
placeholder={
placeholder || __( 'Course Title', 'sensei-lms' )
}
{ ...( Platform.isNative && { deleteEnter: true } ) } // setup RichText on native mobile to delete the "Enter" key as it's handled by the JS/RN side
{ ...blockProps }
/>
</>
);
};
8 changes: 6 additions & 2 deletions assets/css/sensei-course-theme/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@
.wp-block-sensei-lms-course-theme-lesson-actions,
.wp-block-sensei-lms-quiz-actions {

.sensei-course-theme-lesson-actions__next-lesson.has-icon {
display: flex;
.sensei-course-theme-lesson-actions__next-lesson,
.sensei-course-theme-lesson-actions__prev-lesson {

&.has-icon {
display: flex;
}
}

@media screen and (max-width: $break-medium) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: added

Added Previous Lesson Button and fix Lesson action ADA issues
4 changes: 4 additions & 0 deletions changelog/changelog-eslms-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: development

Adding missing fucntionalities to Course Title Block
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"automattic/jetpack-changelogger": "3.3.5",
"bamarni/composer-bin-plugin": "1.8.2",
"dms/phpunit-arraysubset-asserts": "0.5.0",
"humbug/php-scoper": "0.15.0",
"humbug/php-scoper": "0.16.0",
"pelago/emogrifier": "7.0.0",
"php-stubs/wordpress-stubs": "^6.3",
"phpcompatibility/phpcompatibility-wp": "2.1.4",
"sirbrillig/phpcs-no-get-current-user": "1.1.0",
"sirbrillig/phpcs-variable-analysis": "2.11.16",
"symfony/polyfill-php80": "1.16.0",
"symfony/polyfill-php80": "1.23.0",
"vimeo/psalm": "4.22.0",
"wp-coding-standards/wpcs": "3.0.1",
"yoast/phpunit-polyfills": "2.0.0"
Expand Down
Loading
Loading