Merge branch 'release-5.7.2'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.7.1",
+  "version": "5.7.2",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "dependencies": {

pom.xml

@@ -35,7 +35,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.7.1</version>
+  <version>5.7.2</version>
   <url>http://wise5.org</url>
 
   <licenses>

src/main/resources/version.txt

@@ -1 +1 @@
-5.7.1
+5.7.2

src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.es6

@@ -3,10 +3,12 @@
 class TopBarController {
   constructor(
       $rootScope,
+      $window,
       ConfigService,
       ProjectService,
       TeacherDataService) {
     this.$rootScope = $rootScope;
+    this.$window = $window;
     this.ConfigService = ConfigService;
     this.ProjectService = ProjectService;
     this.TeacherDataService = TeacherDataService;
@@ -32,6 +34,13 @@ class TopBarController {
     this.themePath = this.ProjectService.getThemePath();
   }
 
+  /**
+   * Open the Authoring Tool FAQ Google document in a new tab.
+   */
+  helpButtonClicked() {
+    this.$window.open('https://docs.google.com/document/d/1G8lVtiUlGXLRAyFOvkEdadHYhJhJLW4aor9dol2VzeU', '_blank');
+  }
+
   /**
    * Navigate the teacher to the teacher home page
    */
@@ -51,6 +60,7 @@ class TopBarController {
 
 TopBarController.$inject = [
     '$rootScope',
+    '$window',
     'ConfigService',
     'ProjectService',
     'TeacherDataService'
@@ -80,6 +90,8 @@ const TopBar = {
           </span>
         </h3>
         <span flex></span>
+        <md-button style="text-transform: none;"
+            ng-click="$ctrl.helpButtonClicked()">{{ 'HELP' | translate }}</md-button>
         <md-menu id='accountMenu' md-position-mode="target-right target" md-offset="8 26">
           <md-button aria-label="{{ 'USER_MENU' | translate }}" class="md-icon-button" ng-click="$mdMenu.open($event)">
             <md-icon md-menu-origin> account_box </md-icon>

src/main/webapp/wise5/i18n/i18n_en.json

@@ -39,6 +39,7 @@
     "HAS_ALERTS_NEW": "Has new alert(s)",
     "HAS_ALERTS_DISMISSED": "Has dismissed alert(s)",
     "HEIGHT": "Height",
+    "HELP": "Help",
     "HIDE_ADVANCED_AUTHORING": "Hide Advanced Authoring",
     "ID": "ID",
     "IMPORT_PREVIOUS_WORK": "Import Previous Work",