Skip to content
Merged
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
10 changes: 1 addition & 9 deletions src/app/teacher/authoring-tool.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -58,16 +56,13 @@ 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';

@NgModule({
declarations: [
AdvancedProjectAuthoringComponent,
AuthoringToolComponent,
ChooseMoveNodeLocationComponent,
ConcurrentAuthorsMessageComponent,
ConfigureAutomatedAssessmentComponent,
Expand All @@ -92,7 +87,7 @@ import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-uni
AddProjectComponent,
AddStepButtonComponent,
AddYourOwnNodeComponent,
AuthoringToolBarComponent,
AuthoringToolComponent,
ChooseAutomatedAssessmentComponent,
ChooseCopyNodeLocationComponent,
ChooseImportComponentComponent,
Expand All @@ -115,19 +110,16 @@ import { EditUnitTypeComponent } from '../../assets/wise5/authoringTool/edit-uni
MatExpansionModule,
InsertNodeAfterButtonComponent,
InsertNodeInsideButtonComponent,
MainMenuComponent,
NgSelectModule,
NodeAdvancedAuthoringModule,
NodeIconAndTitleComponent,
NodeWithMoveAfterButtonComponent,
ProjectAssetAuthoringModule,
ProjectListComponent,
RouterModule,
SideMenuComponent,
StructureAuthoringModule,
StudentTeacherCommonModule,
TeacherNodeIconComponent,
TopBarComponent,
TranslatableInputComponent,
TranslatableRichTextEditorComponent,
TranslatableTextareaComponent,
Expand Down
4 changes: 2 additions & 2 deletions src/assets/wise5/authoringTool/authoring-tool.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div id="top" class="app-styles authoring" disable-delete-keypress role="main">
<mat-drawer-container>
<mat-drawer #drawer [(opened)]="isMenuOpen" mode="over" class="mat-elevation-z4">
<main-menu [title]="title" [views]="views"></main-menu>
<main-menu [title]="title" [views]="views" />
</mat-drawer>
<mat-drawer-content>
<at-top-bar
Expand All @@ -25,7 +25,7 @@
role="main"
cdkScrollable
>
<router-outlet></router-outlet>
<router-outlet />
</content>
@if (showToolbar) {
<side-menu [views]="views" />
Expand Down
29 changes: 24 additions & 5 deletions src/assets/wise5/authoringTool/authoring-tool.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
30 changes: 15 additions & 15 deletions src/messages.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">96</context>
<context context-type="linenumber">114</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
Expand Down Expand Up @@ -2358,7 +2358,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">25</context>
<context context-type="linenumber">43</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
Expand Down Expand Up @@ -9031,7 +9031,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">68</context>
<context context-type="linenumber">86</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
Expand Down Expand Up @@ -10254,14 +10254,14 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Unit Home</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">61</context>
<context context-type="linenumber">79</context>
</context-group>
</trans-unit>
<trans-unit id="6131903115724196018" datatype="html">
<source>File Manager</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">75</context>
<context context-type="linenumber">93</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
Expand All @@ -10272,7 +10272,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Notebook Settings</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">82</context>
<context context-type="linenumber">100</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
Expand All @@ -10287,7 +10287,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Milestones</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">89</context>
<context context-type="linenumber">107</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
Expand All @@ -10306,14 +10306,14 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Unit List</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">103</context>
<context context-type="linenumber">121</context>
</context-group>
</trans-unit>
<trans-unit id="2304476742154607725" datatype="html">
<source>You have been inactive for a long time. Do you want to stay logged in?</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">117</context>
<context context-type="linenumber">135</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroom-monitor.component.ts</context>
Expand All @@ -10328,7 +10328,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Session Timeout</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">118</context>
<context context-type="linenumber">136</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroom-monitor.component.ts</context>
Expand All @@ -10343,7 +10343,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Saving...</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">142</context>
<context context-type="linenumber">160</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/services/notificationService.ts</context>
Expand All @@ -10354,25 +10354,25 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Saved</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">156</context>
<context context-type="linenumber">174</context>
</context-group>
</trans-unit>
<trans-unit id="6634710158550020332" datatype="html">
<source>Error Saving Unit. Please refresh the page.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">163</context>
<context context-type="linenumber">181</context>
</context-group>
</trans-unit>
<trans-unit id="586193560737361056" datatype="html">
<source>You do not have permission to edit this unit.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">170</context>
<context context-type="linenumber">188</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
<context context-type="linenumber">252</context>
<context context-type="linenumber">271</context>
</context-group>
</trans-unit>
<trans-unit id="6518704574892501259" datatype="html">
Expand Down
Loading