Merge pull request #719 from mathematicalthinking/develop

Encompass 3.5.7 - Merge develop into main.
mathematicalthinking · Jul 27, 2023 · 5e9ee84 · 5e9ee84
2 parents bd4572c + d704711
commit 5e9ee84
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 102 deletions.
diff --git a/app/styles/_base.scss b/app/styles/_base.scss
@@ -941,46 +941,24 @@ section > h2 {
  font-weight: bold;
 }
 
-.al_sprite {
- position: relative;
- background: url(../assets/images/sprites.png) 0 0 no-repeat;
- display: inline-block;
- zoom: 1;
-}
-
-.al_sprite.al_folder {
- top: -3px;
- width: 31px;
- height: 31px;
- background-position: -7px -3px;
- vertical-align: middle;
-}
-
-.al_sprite.al_folder.al_open {
- background-position: -52px -3px;
-}
-
 /* -- Folder View -- */
 
 #folder_header {
  display: block;
- background-color: #f0e68c;
- vertical-align: middle;
  border-bottom: solid 1px #778899;
+ border: 0.5px solid black;
+ padding-bottom: 0.5em;
+ background-color: #f5f5f5;
 }
 
-#folder_header #beta {
- font: 1.5em;
- padding: 0.75em;
- margin: auto;
+#menubar {
  display: inline-block;
- float: right;
- background: #c7bb54;
-}
 
-#folder_header > div#menubar > h1,
-#folder_header > div#menubar > h1 > span {
- display: inline-block;
+ h1 {
+ font-size: 18px;
+ padding: 4px 8px;
+ border-radius: 4px;
+ }
 }
 
 #folder_header > div#statusbar {
@@ -999,11 +977,11 @@ section > h2 {
 #subcontrols {
  position: fixed;
  background: #ddd;
+ margin-right: 2em;
  padding: 0.25em;
  height: 100%;
- width: 19%;
+ width: 10%;
  float: left;
- margin-top: 0.5em;
 }
 
 #subcontrols label {
@@ -1012,7 +990,6 @@ section > h2 {
 
 #folder_contents {
  border: solid 1px;
- width: 80%;
  margin-top: 1.75em;
 }
 

diff --git a/app/templates/folders/edit.hbs b/app/templates/folders/edit.hbs
@@ -1,12 +1,12 @@
 <div style=''>
  <div id='folder_header'>
  <div id='menubar'>
- <span class='al_sprite al_folder al_open'></span>
- <h1> {{model.name}} </h1>
+
+ <h1> Assignment Name: {{model.name}} </h1>
  </div>
  <div id='statusbar'>
- <span>{{model._submissions.length}} submission(s), </span>
- <span>{{evidence.length}} selection(s)</span>
+ <div>Number of submissions: {{model._submissions.length}} </div>
+ <div>Number of selections: {{evidence.length}}</div>
  </div>
  </div>
 
@@ -35,73 +35,59 @@
  Include Sub-Folders
  </label>
  </div>
-</div>
-<div id='subcontrols'>
- Show:
- {{#if bySubmission}}
- <ul>
+ <div id='controls'>Show:
+ {{#if bySubmission}}
+ <ul>
 
- <li><label id='showEvidence'>
- <Input
- @type='checkbox'
- @name={{showSubmissionSelections}}
- @checked={{showSubmissionSelections}}
- />
- Evidence
- </label></li>
+  <li><label id='showEvidence'>
+  <Input
+  @type='checkbox'
+  @name={{showSubmissionSelections}}
+  @checked={{showSubmissionSelections}}
+  />
+  Evidence
+  </label></li>
 
- {{#if showSubmissionSelections}}
- <li><ul>
- <li><label id='showSubmComments'>
- <Input
- @type='checkbox'
- @name={{showSubmissionSelectionsComments}}
- @checked={{showSubmissionSelectionsComments}}
- />
- Comments
- </label></li>
+  {{#if showSubmissionSelections}}
+  <li><ul>
+  <li><label id='showSubmComments'>
+  <Input
+  @type='checkbox'
+  @name={{showSubmissionSelectionsComments}}
+  @checked={{showSubmissionSelectionsComments}}
+  />
+  Comments
+  </label></li>
 
- <li><label id='showSubmFolders'>
- <Input
- @type='checkbox'
- @name={{showSubmissionSelectionsFolders}}
- @checked={{showSubmissionSelectionsFolders}}
- />
- Folders
- </label></li>
+  <li><label id='showSubmFolders'>
+  <Input
+  @type='checkbox'
+  @name={{showSubmissionSelectionsFolders}}
+  @checked={{showSubmissionSelectionsFolders}}
+  />
+  Folders
+  </label></li>
 
- </ul></li>
- {{/if}}
+ </ul></li>
+ {{/if}}
+ </ul>
+ {{/if}}
+ {{#if bySelection}}
+ <label id='showSubmissions'>
+ <Input @type='checkbox' @checked={{showSelectionSubmission}} />
+ Student
+ </label>
 
- <!-- Do we need these?
- <li><label>
- {{!input type="checkbox" name=showSubmissionComments checked=showSubmissionComments}}
- comments
- </label></li>
+ <label id='showSelComments'>
+ <Input @type='checkbox' @checked={{showSelectionComments}} />
+ Comments
+ </label>
 
- <li><label>
- {{!input type="checkbox" name=showSubmissionFolders checked=showSubmissionFolders}}
- folders
- </label></li>
--->
- </ul>
- {{/if}}
- {{#if bySelection}}
- <label id='showSubmissions'>
- <Input @type='checkbox' @checked={{showSelectionSubmission}} />
- Student
- </label>
-
- <label id='showSelComments'>
- <Input @type='checkbox' @checked={{showSelectionComments}} />
- Comments
- </label>
-
- <label id='showSelFolders'>
- <Input @type='checkbox' @checked={{showSelectionFolders}} />
- Folders
- </label>
- {{/if}}
+ <label id='showSelFolders'>
+ <Input @type='checkbox' @checked={{showSelectionFolders}} />
+ Folders
+ </label>
+ {{/if}}</div>
 </div>
 
 <div class='al_wtf'>

diff --git a/app/templates/index.hbs b/app/templates/index.hbs
@@ -103,7 +103,7 @@
  <div class='footerNote'>
 
 
- <p>EnCoMPASS version 3.5.6 last updated on 06/13/2023. </p>
+ <p>EnCoMPASS version 3.5.7 last updated on 07/26/2023. </p>
 
 
  <p><a href='https://encompassmath.org/' target='_blank'>EnCoMPASS</a>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "encompass",
- "version": "3.5.6",
+ "version": "3.5.7",
  "private": true,
  "description": "enCoMPASS",
  "keywords": [