updates
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2b17add..f4e696c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@
on:
push:
- branches: [ master ]
+ branches: [ main ]
jobs:
deploy:
diff --git a/README.md b/README.md
index 53d4136..fb3de87 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
<a href="https://powerplus.app"><img src="https://img.shields.io/website/https/powerplus.app.svg?label=server%20status" /></a>
<a href="https://github.com/jottocraft/dtps/actions?query=workflow%3Adeploy"><img src="https://github.com/jottocraft/dtps/workflows/deploy/badge.svg" /></a>
<a href="https://github.com/jottocraft/dtps/actions?query=workflow%3Adev"><img src="https://github.com/jottocraft/dtps/workflows/dev/badge.svg" /></a>
- <a href="https://powerplus.app/docs"><img src="http://inch-ci.org/github/jottocraft/dtps.svg?branch=master&style=shields" /></a>
+ <a href="https://powerplus.app/docs"><img src="http://inch-ci.org/github/jottocraft/dtps.svg?branch=main&style=shields" /></a>
</p>
<p align="center">
@@ -36,4 +36,4 @@
<br /><br /><br /><br /><br /><br />
-(c) 2018-2020 jottocraft [license](https://github.com/jottocraft/dtps/blob/master/LICENSE)
+(c) 2018-2020 jottocraft [license](https://github.com/jottocraft/dtps/blob/main/LICENSE)
diff --git a/docs/README.md b/docs/README.md
index 4ccbcd6..84776e8 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,5 +2,5 @@
### Resources
- [GitHub](https://github.com/jottocraft/dtps)
-- [Contributing](https://github.com/jottocraft/dtps/blob/master/CONTRIBUTING.md)
+- [Contributing](https://github.com/jottocraft/dtps/blob/main/CONTRIBUTING.md)
- [Power+ website](https://powerplus.app)
\ No newline at end of file
diff --git a/dtps.css b/dtps.css
index 577a7c8..3f8cd14 100644
--- a/dtps.css
+++ b/dtps.css
@@ -280,12 +280,12 @@
}
.classContent .card.collapsed h4 {
- font-size: 24px !important;
+ font-size: 18px !important;
font-weight: normal !important;
}
.classContent .card.collapsed h4 i {
- margin-top: -6px;
+ margin-top: -3px;
}
.classContent .card.collapsed .moduleContents {
@@ -1085,8 +1085,8 @@
}
.card.module h4 {
- margin: 5px 2px;
- font-size: 32px;
+ margin: 0px 2px;
+ font-size: 24px;
font-weight: bold;
}
@@ -1098,8 +1098,8 @@
.moduleItem {
color: var(--lightText);
- padding:10px;
- font-size:17px;
+ padding:5px;
+ font-size:14px;
border-radius:15px;
margin:5px 0;
cursor: pointer;
@@ -1107,7 +1107,8 @@
.moduleItem i {
vertical-align: middle;
- margin-right: 10px;
+ margin-right: 4px;
+ font-size: 20px;
}
.background, .cover.image {
diff --git a/package.json b/package.json
index 57c5c15..acc2ca6 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"predeploy": "npm run build",
"deploy": "gh-pages -d build -m \"npm deploy\"",
"predev": "npm run build -- --dev",
- "dev": "gh-pages -d build -m \"npm dev\" -r [email protected]:jottocraft/dtps-dev.git -b master",
+ "dev": "gh-pages -d build -m \"npm dev\" -r [email protected]:jottocraft/dtps-dev.git -b main",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
diff --git a/scripts/assignments.js b/scripts/assignments.js
index 3bbabe7..1deae45 100644
--- a/scripts/assignments.js
+++ b/scripts/assignments.js
@@ -95,7 +95,7 @@
/**
* Renders the DTPS dashboard and calls dtps.renderCalendar, dtps.renderUpdates, and dtps.renderUpcoming
*/
-dtps.masterStream = function () {
+dtps.mainStream = function () {
//Ensure classes are rendered in the sidebar
dtps.presentClass("dash");
dtps.showClasses();
@@ -674,7 +674,29 @@
//Show loading indicator
if ((dtps.selectedClass == classNum) && (dtps.selectedContent == "moduleStream")) {
- jQuery(".classContent").html(dtps.renderStreamTools(classNum, "modules") + `<div class="spinner"></div>`);
+ jQuery(".classContent").html(dtps.renderStreamTools(classNum, "modules") + /*html*/`
+ <div class="module card collapsed">
+ <h4>
+ <i class="material-icons collapseIcon shimmer">star</i>
+ <span class="shimmer">[SHIMMER] Module title (collapsed)</span>
+ </h4>
+ <div class="moduleContents" style="padding-top: 10px;"></div>
+ </div>
+ <div class="module card">
+ <h4>
+ <i class="material-icons collapseIcon shimmer">star</i>
+ <span class="shimmer">[SHIMMER] Module title</span>
+ </h4>
+
+ <div class="moduleContents" style="padding-top: 10px;">
+ <div class="moduleItem shimmer">[SHMMER] module item</div>
+ <div class="moduleItem shimmer">[SHMMER] module item</div>
+ <div class="moduleItem shimmer">[SHMMER] module item</div>
+ <div class="moduleItem shimmer">[SHMMER] module item</div>
+ <div class="moduleItem shimmer">[SHMMER] module item</div>
+ </div>
+ </div>
+ `);
}
new Promise(resolve => {
@@ -718,7 +740,7 @@
//Get module HTML
if (item.type == "header") {
- moduleItemHTML += `<h5 style="font-size: 22px;padding: 2px 10px;">${item.title}</h5>`;
+ moduleItemHTML += `<h5 style="font-size: 16px;padding: 0px 10px; text-decoration: underline;">${item.title}</h5>`;
} else {
moduleItemHTML += `
<div class="moduleItem" onclick="${action}" style="margin-left: ${item.indent * 15}px;">
@@ -1092,7 +1114,7 @@
//Fluid UI screen definitions
fluid.externalScreens.dashboard = () => {
- dtps.masterStream();
+ dtps.mainStream();
}
fluid.externalScreens.stream = (courseID) => {
diff --git a/scripts/core.js b/scripts/core.js
index dacbbce..e0ae4f4 100644
--- a/scripts/core.js
+++ b/scripts/core.js
@@ -1313,7 +1313,7 @@
<div class="items" style="text-align: center; width: calc(100% - 280px);">
<i class="inputIcon material-icons">search</i>
- <input style="margin: 0px; width: 500px;" type="search" class="inputIcon filled" placeholder="Search" />
+ <input id="dtpsMainSearchBox" style="margin: 0px; width: 500px;" type="search" class="inputIcon filled" placeholder="Search" />
</div>
<div class="profile">
@@ -1700,7 +1700,7 @@
<div style="text-align: center; padding: 50px 0px;">
<img style="height: 45px; margin-right: 20px; vertical-align: middle;" src="https://cdn.jottocraft.com/images/footerImage.png" />
<h5 style="display: inline-block; vertical-align: middle;">jottocraft</h5>
- <p>(c) jottocraft 2018-2020. All rights reserved. <a href="https://github.com/jottocraft/dtps">source code</a> <a href="https://github.com/jottocraft/dtps/blob/master/LICENSE">license</a></p>
+ <p>(c) jottocraft 2018-2020. All rights reserved. <a href="https://github.com/jottocraft/dtps">source code</a> <a href="https://github.com/jottocraft/dtps/blob/main/LICENSE">license</a></p>
</div>
</div>
</div>
diff --git a/scripts/lms/canvas.js b/scripts/lms/canvas.js
index 3335cbc..49e8d5a 100644
--- a/scripts/lms/canvas.js
+++ b/scripts/lms/canvas.js
@@ -16,7 +16,7 @@
description: "Power+ integration for Canvas LMS",
url: "https://www.instructure.com/canvas/",
logo: "https://i.imgur.com/rGjNVoc.png",
- source: "https://github.com/jottocraft/dtps/blob/master/scripts/lms/canvas.js",
+ source: "https://github.com/jottocraft/dtps/blob/main/scripts/lms/canvas.js",
genericGradebook: true
};
diff --git a/scripts/lms/demo.js b/scripts/lms/demo.js
index 7a68433..6dd2b62 100644
--- a/scripts/lms/demo.js
+++ b/scripts/lms/demo.js
@@ -16,7 +16,7 @@
description: "All content in this LMS is not real and is for demonstration purposes only",
url: "https://powerplus.app",
logo: "https://powerplus.app/logo.png",
- source: "https://github.com/jottocraft/dtps/blob/master/scripts/lms/demo.js",
+ source: "https://github.com/jottocraft/dtps/blob/main/scripts/lms/demo.js",
genericGradebook: true,
isDemoLMS: true
};
diff --git a/scripts/lms/dtech.js b/scripts/lms/dtech.js
index 451aa1b..d85c687 100644
--- a/scripts/lms/dtech.js
+++ b/scripts/lms/dtech.js
@@ -19,7 +19,7 @@
dtpsLMS.legalName = "Canvas LMS, Design Tech High School, and Instructure Inc";
dtpsLMS.description = "Power+ integration for Canvas LMS, customized for d.tech";
dtpsLMS.logo = "https://i.imgur.com/efGrLq3.png";
- dtpsLMS.source = "https://github.com/jottocraft/dtps/blob/master/scripts/lms/dtech.js";
+ dtpsLMS.source = "https://github.com/jottocraft/dtps/blob/main/scripts/lms/dtech.js";
dtpsLMS.useRubricGrades = true;
dtpsLMS.institutionSpecific = true;
dtpsLMS.genericGradebook = false;
diff --git a/scripts/people.js b/scripts/people.js
index eb2d785..9d4747d 100644
--- a/scripts/people.js
+++ b/scripts/people.js
@@ -63,7 +63,22 @@
</div>
`);
} else {
- jQuery(".classContent").html(sections.map(section => (
+ jQuery(".classContent").html(/*html*/`
+ <div style="--size: 250px; margin: 0px 20px;" class="grid flex">
+ <div class="block status card">
+ <h2 class="main">--</h2>
+ <h5 class="bottom"><i class="material-icons">contact_page</i> Your section</h5>
+ </div>
+ <div class="block status">
+ <h2 class="main numFont">--</h2>
+ <h5 class="bottom"><i class="material-icons">groups</i> Total Students</h5>
+ </div>
+ <div class="block status">
+ <h2 class="main numFont">--</h2>
+ <h5 class="bottom"><i class="material-icons">school</i> Teachers</h5>
+ </div>
+ </div>
+ ` + sections.map(section => (
/*html*/`
<div class="card">
<h5><b>${section.title}</b></h5>
diff --git a/www/index.html b/www/index.html
index 45465e1..9aa9a65 100644
--- a/www/index.html
+++ b/www/index.html
@@ -189,7 +189,7 @@
src="https://cdn.jottocraft.com/images/footerImage.png" />
<h5 style="display: inline-block; vertical-align: middle;">jottocraft</h5>
<p>(c) jottocraft 2018-2020. All rights reserved. <a href="https://github.com/jottocraft/dtps">source
- code</a> <a href="https://github.com/jottocraft/dtps/blob/master/LICENSE">license</a></p>
+ code</a> <a href="https://github.com/jottocraft/dtps/blob/main/LICENSE">license</a></p>
</div>