Merge branch 'release-5.18.3'

WISE-Community · Nov 10, 2020 · 78ada2b · 78ada2b
2 parents a5d00d2 + aebab44
commit 78ada2b
Show file tree

Hide file tree

Showing 44 changed files with 224 additions and 319 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.18.2",
+  "version": "5.18.3",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.18.2</version>
+  <version>5.18.3</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-5.18.2
+5.18.3
diff --git a/src/main/webapp/portal/admin/index.jsp b/src/main/webapp/portal/admin/index.jsp
@@ -172,33 +172,31 @@
 
                     </div>
 
-                    <sec:authorize access="hasRole('ROLE_ADMINISTRATOR')">
-                        <div class="sectionHead">
-                            <spring:message code='admin.index.projectManagement' />
-                        </div>
-                        <div class="sectionContent">
-                            <spring:message code='admin.index.manageProjectBy' />
-                            <form style="display:inline" id="lookupProjectForm" action="${contextPath}/admin/project/manageallprojects.html" method="GET" onsubmit="return validateForm('project')">
-                                <select name="projectLookupType" id="projectLookupType">
-                                    <option value="id"><spring:message code='id' /></option>
-                                    <option value="title"><spring:message code='title' /></option>
-                                    <option value="author"><spring:message code='author' /></option>
-                                </select>
-                                <input type="text" name="projectLookupValue" id="projectLookupValue" size="20"></input>
-                                <input type="Submit" value="Go"></input>
-                            </form> |
-                            <a href="${contextPath}/admin/project/manageallprojects.html">
-                                <spring:message code='admin.index.manageAllProjects' /></a>
-                            <h5>
-                                <a href="${contextPath}/admin/project/currentlyAuthoredProjects">
-                                    <spring:message code='admin.index.viewCurrentAuthors' /></a>
-                            </h5>
-                            <h5>
-                                <a href="${contextPath}/admin/project/import">
-                                    <spring:message code='admin.index.importProject' /></a>
-                            </h5>
-                        </div>
-                    </sec:authorize>
+                    <div class="sectionHead">
+                        <spring:message code='admin.index.projectManagement' />
+                    </div>
+                    <div class="sectionContent">
+                        <spring:message code='admin.index.manageProjectBy' />
+                        <form style="display:inline" id="lookupProjectForm" action="${contextPath}/admin/project/manageallprojects.html" method="GET" onsubmit="return validateForm('project')">
+                            <select name="projectLookupType" id="projectLookupType">
+                                <option value="id"><spring:message code='id' /></option>
+                                <option value="title"><spring:message code='title' /></option>
+                                <option value="author"><spring:message code='author' /></option>
+                            </select>
+                            <input type="text" name="projectLookupValue" id="projectLookupValue" size="20"></input>
+                            <input type="Submit" value="Go"></input>
+                        </form> |
+                        <a href="${contextPath}/admin/project/manageallprojects.html">
+                            <spring:message code='admin.index.manageAllProjects' /></a>
+                        <h5>
+                            <a href="${contextPath}/admin/project/currentlyAuthoredProjects">
+                                <spring:message code='admin.index.viewCurrentAuthors' /></a>
+                        </h5>
+                        <h5>
+                            <a href="${contextPath}/admin/project/import">
+                                <spring:message code='admin.index.importProject' /></a>
+                        </h5>
+                    </div>
 
                     <div class="sectionHead">
                         <spring:message code='misc' />

diff --git a/src/main/webapp/portal/admin/project/manageallprojects.jsp b/src/main/webapp/portal/admin/project/manageallprojects.jsp
@@ -149,7 +149,6 @@ function updateMaxTotalAssetsSize(projectId, newMaxTotalAssetsSize) {
 		</td>
 		<td>
 		<a href="${contextPath}/author/authorproject.html?projectId=${project.id}">Edit Project</a><br/>
-		<a href="${contextPath}/teacher/projects/customized/shareproject.html?projectId=${project.id}">Manage Shared Teachers</a><br/>
 		<a href="${contextPath}/project/export/${project.id}">Export project as Zip</a>
 		</td>
 	</tr>

diff --git a/src/main/webapp/portal/admin/run/manageprojectruns.jsp b/src/main/webapp/portal/admin/run/manageprojectruns.jsp
@@ -422,9 +422,6 @@
                                                 |&nbsp;<a onclick="if(confirm('<spring:message code="teacher.management.projectruntabs.editWarning"/>')){window.top.location='${contextPath}/author/authorproject.html?projectId=${run.project.id}';} return true;"><img class="icon" alt="edit" src="${contextPath}/<spring:theme code="edit"/>" /><span><spring:message code="teacher.management.projectruntabs.edit"/></span></a>
                                             </li>
                                         </ul>
-                                        <ul class="actionList">
-                                            <li><a id="shareRun_${run.id}" class="shareRun" title="<spring:message code="teacher.management.projectruntabs.sharingPermissionsTitle"/> ${run.name} (<spring:message code="run_id"/> ${run.id})"><img class="icon" alt="share" src="${contextPath}/<spring:theme code="agent"/>" /><span><spring:message code="teacher.management.projectruntabs.sharingPermissions"/></span></a></li>
-                                        </ul>
                                     </td>
                                     <td style="display:none;">${run.starttime}</td>
                                     <td style="display:none;"></td>

diff --git a/src/main/webapp/portal/admin/run/stats.jsp b/src/main/webapp/portal/admin/run/stats.jsp
@@ -60,7 +60,6 @@ th {
 			    <td>
 			    	<ul>
 			    		<sec:authorize access="hasRole('ROLE_ADMINISTRATOR')">
-			    		  <li><a href="${contextPath}/teacher/run/shareprojectrun.html?runId=${run.id}"><spring:message code="admin.run.manageSharedTeachers" /></a></li>
 			    		  <li><a href="${contextPath}/teacher/management/viewmystudents?runId=${run.id}"><spring:message code="admin.run.manageStudents" /></a></li>
 			    		</sec:authorize>
 			    	</ul>

diff --git a/src/main/webapp/site/src/app/app.component.ts b/src/main/webapp/site/src/app/app.component.ts
@@ -205,8 +205,7 @@ export class AppComponent {
 
   onYPositionChange(el:HTMLElement) {
     this.pageY = el.scrollTop;
-    const isAtBottom = this.pageY >= el.scrollHeight - el.offsetHeight - 2;
-    this.scroll = isAtBottom || (this.pageY > 360 && this.pageY < this.prevPageY);
+    this.scroll = this.pageY > 360 && this.pageY < this.prevPageY;
     this.prevPageY = this.pageY;
   }
 

diff --git a/src/main/webapp/site/src/app/common-hybrid-angular.module.ts b/src/main/webapp/site/src/app/common-hybrid-angular.module.ts
@@ -48,6 +48,7 @@ import { MatCardModule } from '@angular/material/card';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatSelectModule } from '@angular/material/select';
 import { HelpIconComponent } from '../../../wise5/themes/default/themeComponents/helpIcon/help-icon.component';
+import { NodeStatusIcon } from '../../../wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component';
 
 @Component({template: ``})
 export class EmptyComponent {}
@@ -57,6 +58,7 @@ export class EmptyComponent {}
     EmptyComponent,
     HelpIconComponent,
     NodeIconComponent,
+    NodeStatusIcon
   ],
   imports: [
     UpgradeModule,

diff --git a/src/main/webapp/site/src/app/modules/footer/footer.component.html b/src/main/webapp/site/src/app/modules/footer/footer.component.html
@@ -19,24 +19,24 @@
       <div>
         <a href="https://www.facebook.com/wisetels/"
            target="_blank"
-           mat-icon-button>
-          <mat-icon svgIcon="facebook-ffffff"
-                    i18n-aria-label
-                    aria-label="WISE on Facebook"></mat-icon>
+           mat-icon-button
+           i18n-aria-label
+           aria-label="WISE on Facebook">
+          <mat-icon svgIcon="facebook-ffffff"></mat-icon>
         </a>
         <a href="https://twitter.com/WISETELS"
            target="_blank"
-           mat-icon-button>
-          <mat-icon svgIcon="twitter-ffffff"
-                    i18n-aria-label
-                    aria-label="WISE on Twitter"></mat-icon>
+           mat-icon-button
+           i18n-aria-label
+           aria-label="WISE on Twitter">
+          <mat-icon svgIcon="twitter-ffffff"></mat-icon>
         </a>
         <a href="https://github.com/WISE-Community"
            target="_blank"
-           mat-icon-button>
-          <mat-icon svgIcon="github-ffffff"
-                    i18n-aria-label
-                    aria-label="WISE on Github"></mat-icon>
+           mat-icon-button
+           i18n-aria-label
+           aria-label="WISE on Github">
+          <mat-icon svgIcon="github-ffffff"></mat-icon>
         </a>
       </div>
     </div>
@@ -52,7 +52,8 @@
         <p i18n>Powered by the <a href="https://wise-research.berkeley.edu" target="_blank">TELS Research Community</a> and <a href="https://github.com/WISE-Community/WISE" target="_blank">WISE Open Source Technology</a>. Help us <a href="https://crowdin.com/project/wise" target="_blank">translate</a> WISE!</p>
         <p i18n>This material is based upon work supported by the National Science Foundation. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation.</p>
       </div>
-      <div fxFlex="0 0 auto">
+      <div fxFlex="100%"
+           fxFlex.gt-sm="1 1 0">
         <div class="footer__section"
              fxLayout="row wrap"
              fxLayoutAlign="center center"
@@ -64,13 +65,16 @@
               <img src="assets/img/footer/nsf-logo.png" i18n-alt alt="National Science Foundation" />
             </picture>
           </a>
-          <a href="http://berkeley.edu" target="_blank">
+          <a href="https://berkeley.edu" target="_blank">
             <picture>
               <source type="image/webp" srcset="assets/img/footer/uc-berkeley-logo.webp, assets/img/footer/uc-berkeley-logo@2x.webp 2x">
               <source srcset="assets/img/footer/uc-berkeley-logo.png, assets/img/footer/uc-berkeley-logo@2x.png 2x">
               <img src="assets/img/footer/uc-berkeley-logo.png" i18n-alt alt="UC Berkeley" />
             </picture>
           </a>
+          <a href="https://ets.org" target="_blank">
+            <img src="assets/img/footer/ETS-Logo-navy-gold.svg" i18n-alt alt="ETS" />
+          </a>
           <a href="https://concord.org" target="_blank">
             <picture>
               <source type="image/webp" srcset="assets/img/footer/cc-logo.webp, assets/img/footer/cc-logo@2x.webp 2x">

diff --git a/src/main/webapp/site/src/app/teacher-hybrid-angular.module.ts b/src/main/webapp/site/src/app/teacher-hybrid-angular.module.ts
@@ -25,6 +25,7 @@ import { ComponentNewWorkBadgeComponent } from './classroom-monitor/component-ne
 import { StatusIconComponent } from './classroom-monitor/status-icon/status-icon.component';
 import { AngularJSModule } from './common-hybrid-angular.module';
 import { NodeAdvancedJsonAuthoringComponent } from '../../../wise5/authoringTool/node/advanced/json/node-advanced-json-authoring.component';
+import { WorkgroupInfoComponent } from '../../../wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component';
 
 @NgModule({
   declarations: [
@@ -38,6 +39,7 @@ import { NodeAdvancedJsonAuthoringComponent } from '../../../wise5/authoringTool
     MilestoneReportDataComponent,
     NodeAdvancedJsonAuthoringComponent,
     StatusIconComponent,
+    WorkgroupInfoComponent,
     WorkgroupNodeScoreComponent,
     NavItemScoreComponent
   ],

diff --git a/src/main/webapp/site/src/assets/img/footer/ETS-Logo-navy-gold.svg b/src/main/webapp/site/src/assets/img/footer/ETS-Logo-navy-gold.svg
-Original file line number
+Diff line change
@@ Expand Up @@
     		</td>
     		<td>
     		<a href="${contextPath}/author/authorproject.html?projectId=${project.id}">Edit Project</a><br/>
-    		<a href="${contextPath}/teacher/projects/customized/shareproject.html?projectId=${project.id}">Manage Shared Teachers</a><br/>
     		<a href="${contextPath}/project/export/${project.id}">Export project as Zip</a>
     		</td>
     	</tr>
@@ Expand Down @@