Merge branch 'develop' of https://github.com/WISE-Community/WISE into develop

Author: geoffreykwan

src/main/webapp/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html

@@ -15,24 +15,24 @@
   </div>
   <div>
     <md-checkbox class='md-primary'
-                 ng-model='$ctrl.authoringComponentContent.showSaveButton'
+                 ng-if='$ctrl.isNotebookEnabled()'
+                 ng-model='$ctrl.authoringComponentContent.importPrivateNotes'
                  ng-change='$ctrl.componentChanged()'>
-      {{ ::'SHOW_SAVE_BUTTON' | translate }}
+      {{ ::'match.showPrivateNotesAsChoices' | translate }}
     </md-checkbox>
   </div>
   <div>
     <md-checkbox class='md-primary'
-                 ng-model='$ctrl.authoringComponentContent.showSubmitButton'
+                 ng-model='$ctrl.authoringComponentContent.showSaveButton'
                  ng-change='$ctrl.componentChanged()'>
-      {{ ::'SHOW_SUBMIT_BUTTON' | translate }}
+      {{ ::'SHOW_SAVE_BUTTON' | translate }}
     </md-checkbox>
   </div>
   <div>
     <md-checkbox class='md-primary'
-                 ng-if='$ctrl.isNotebookEnabled()'
-                 ng-model='$ctrl.authoringComponentContent.importPrivateNotes'
+                 ng-model='$ctrl.authoringComponentContent.showSubmitButton'
                  ng-change='$ctrl.componentChanged()'>
-      {{ ::'match.showPrivateNotesAsChoices' | translate }}
+      {{ ::'SHOW_SUBMIT_BUTTON' | translate }}
     </md-checkbox>
   </div>
   <div>

src/main/webapp/wise5/components/match/edit-match-advanced/edit-match-advanced.component.ts

@@ -27,5 +27,5 @@ export const EditMatchAdvancedComponent = {
     componentId: '@'
   },
   controller: EditMatchAdvancedController,
-  templateUrl: 'wise5/components/label/edit-label-advanced/edit-label-advanced.component.html'
+  templateUrl: 'wise5/components/match/edit-match-advanced/edit-match-advanced.component.html'
 };