diff --git a/src/app/teacher/authoring-tool.module.ts b/src/app/teacher/authoring-tool.module.ts index 32f1f2ba86f..586c98ddc2b 100644 --- a/src/app/teacher/authoring-tool.module.ts +++ b/src/app/teacher/authoring-tool.module.ts @@ -21,7 +21,6 @@ import { WiseTinymceEditorModule } from '../../assets/wise5/directives/wise-tiny import { NotebookAuthoringComponent } from '../../assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component'; import { StructureAuthoringModule } from '../../assets/wise5/authoringTool/structure/structure-authoring.module'; import { MilestonesAuthoringComponent } from '../../assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component'; -import { TopBarComponent } from '../../assets/wise5/authoringTool/components/top-bar/top-bar.component'; import { ProjectAssetAuthoringModule } from '../../assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.module'; import { ChooseSimulationComponent } from '../../assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component'; import { ProjectInfoAuthoringComponent } from '../../assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component'; @@ -30,7 +29,6 @@ import { ConfigureAutomatedAssessmentComponent } from '../../assets/wise5/author import { ProjectListComponent } from '../../assets/wise5/authoringTool/project-list/project-list.component'; import { AddProjectComponent } from '../../assets/wise5/authoringTool/add-project/add-project.component'; import { MatBadgeModule } from '@angular/material/badge'; -import { AuthoringToolBarComponent } from '../../assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component'; import { ProjectAuthoringComponent } from '../../assets/wise5/authoringTool/project-authoring/project-authoring.component'; import { AuthoringToolComponent } from '../../assets/wise5/authoringTool/authoring-tool.component'; import { ChooseMoveNodeLocationComponent } from '../../assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component'; @@ -58,8 +56,6 @@ import { EditBranchComponent } from '../../assets/wise5/authoringTool/edit-branc import { ComponentTypeButtonComponent } from '../../assets/wise5/authoringTool/components/component-type-button/component-type-button.component'; import { MatExpansionModule } from '@angular/material/expansion'; import { AddComponentComponent } from '../../assets/wise5/authoringTool/node/add-component/add-component.component'; -import { SideMenuComponent } from '../../assets/wise5/common/side-menu/side-menu.component'; -import { MainMenuComponent } from '../../assets/wise5/common/main-menu/main-menu.component'; import { ChooseImportComponentComponent } from '../../assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component'; import { EditUnitResourcesComponent } from '../../assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component'; import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component'; @@ -67,7 +63,6 @@ import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-uni @NgModule({ declarations: [ AdvancedProjectAuthoringComponent, - AuthoringToolComponent, ChooseMoveNodeLocationComponent, ConcurrentAuthorsMessageComponent, ConfigureAutomatedAssessmentComponent, @@ -92,7 +87,7 @@ import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-uni AddProjectComponent, AddStepButtonComponent, AddYourOwnNodeComponent, - AuthoringToolBarComponent, + AuthoringToolComponent, ChooseAutomatedAssessmentComponent, ChooseCopyNodeLocationComponent, ChooseImportComponentComponent, @@ -115,7 +110,6 @@ import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-uni MatExpansionModule, InsertNodeAfterButtonComponent, InsertNodeInsideButtonComponent, - MainMenuComponent, NgSelectModule, NodeAdvancedAuthoringModule, NodeIconAndTitleComponent, @@ -123,11 +117,9 @@ import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-uni ProjectAssetAuthoringModule, ProjectListComponent, RouterModule, - SideMenuComponent, StructureAuthoringModule, StudentTeacherCommonModule, TeacherNodeIconComponent, - TopBarComponent, TranslatableInputComponent, TranslatableRichTextEditorComponent, TranslatableTextareaComponent, diff --git a/src/assets/wise5/authoringTool/authoring-tool.component.html b/src/assets/wise5/authoringTool/authoring-tool.component.html index d2b8157ba43..dc7a20e0f02 100644 --- a/src/assets/wise5/authoringTool/authoring-tool.component.html +++ b/src/assets/wise5/authoringTool/authoring-tool.component.html @@ -3,7 +3,7 @@
- + - + @if (showToolbar) { diff --git a/src/assets/wise5/authoringTool/authoring-tool.component.ts b/src/assets/wise5/authoringTool/authoring-tool.component.ts index 01105cedbb3..f1d5347d8d1 100644 --- a/src/assets/wise5/authoringTool/authoring-tool.component.ts +++ b/src/assets/wise5/authoringTool/authoring-tool.component.ts @@ -5,14 +5,32 @@ import { NotificationService } from '../services/notificationService'; import { TeacherProjectService } from '../services/teacherProjectService'; import { SessionService } from '../services/sessionService'; import { TeacherDataService } from '../services/teacherDataService'; -import { NavigationEnd, Router } from '@angular/router'; +import { NavigationEnd, Router, RouterModule } from '@angular/router'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { DialogWithConfirmComponent } from '../directives/dialog-with-confirm/dialog-with-confirm.component'; +import { CommonModule } from '@angular/common'; +import { AuthoringToolBarComponent } from './components/shared/authoring-tool-bar/authoring-tool-bar.component'; +import { MainMenuComponent } from '../common/main-menu/main-menu.component'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { TopBarComponent } from './components/top-bar/top-bar.component'; +import { SideMenuComponent } from '../common/side-menu/side-menu.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { ScrollingModule } from '@angular/cdk/scrolling'; @Component({ - styleUrls: ['./authoring-tool.component.scss'], - templateUrl: './authoring-tool.component.html', - standalone: false + imports: [ + AuthoringToolBarComponent, + CommonModule, + FlexLayoutModule, + MainMenuComponent, + MatSidenavModule, + RouterModule, + ScrollingModule, + SideMenuComponent, + TopBarComponent + ], + styleUrl: './authoring-tool.component.scss', + templateUrl: './authoring-tool.component.html' }) export class AuthoringToolComponent { protected isMenuOpen: boolean = false; @@ -233,7 +251,8 @@ export class AuthoringToolComponent { } private getElements(): any[] { - const elementsToDisable = 'button,input,textarea,mat-radio-button,mat-checkbox,mat-icon[cdkdraghandle]'; + const elementsToDisable = + 'button,input,textarea,mat-radio-button,mat-checkbox,mat-icon[cdkdraghandle]'; return Array.from( this.elem.nativeElement.querySelectorAll(`div.main-content ${elementsToDisable}`) ).concat( diff --git a/src/messages.xlf b/src/messages.xlf index 25381e04756..19ef8197188 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -821,7 +821,7 @@ src/assets/wise5/authoringTool/authoring-tool.component.ts - 96 + 114 src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts @@ -2358,7 +2358,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/authoring-tool.component.ts - 25 + 43 src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts @@ -9031,7 +9031,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/authoring-tool.component.ts - 68 + 86 src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts @@ -10254,14 +10254,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Unit Home src/assets/wise5/authoringTool/authoring-tool.component.ts - 61 + 79 File Manager src/assets/wise5/authoringTool/authoring-tool.component.ts - 75 + 93 src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts @@ -10272,7 +10272,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Notebook Settings src/assets/wise5/authoringTool/authoring-tool.component.ts - 82 + 100 src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts @@ -10287,7 +10287,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Milestones src/assets/wise5/authoringTool/authoring-tool.component.ts - 89 + 107 src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts @@ -10306,14 +10306,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Unit List src/assets/wise5/authoringTool/authoring-tool.component.ts - 103 + 121 You have been inactive for a long time. Do you want to stay logged in? src/assets/wise5/authoringTool/authoring-tool.component.ts - 117 + 135 src/assets/wise5/classroomMonitor/classroom-monitor.component.ts @@ -10328,7 +10328,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Session Timeout src/assets/wise5/authoringTool/authoring-tool.component.ts - 118 + 136 src/assets/wise5/classroomMonitor/classroom-monitor.component.ts @@ -10343,7 +10343,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Saving... src/assets/wise5/authoringTool/authoring-tool.component.ts - 142 + 160 src/assets/wise5/services/notificationService.ts @@ -10354,25 +10354,25 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Saved src/assets/wise5/authoringTool/authoring-tool.component.ts - 156 + 174 Error Saving Unit. Please refresh the page. src/assets/wise5/authoringTool/authoring-tool.component.ts - 163 + 181 You do not have permission to edit this unit. src/assets/wise5/authoringTool/authoring-tool.component.ts - 170 + 188 src/assets/wise5/authoringTool/authoring-tool.component.ts - 252 + 271