Skip to content

Commit

Permalink
Merge pull request #154 from aopell/develop
Browse files Browse the repository at this point in the history
Version 5.3
  • Loading branch information
aopell authored Mar 25, 2019
2 parents 0249f11 + 697f433 commit 17058b6
Show file tree
Hide file tree
Showing 16 changed files with 520 additions and 150 deletions.
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
24 changes: 24 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Contributing to Schoology Plus

Thank you for your interest in contributing to Schoology Plus! This is an open source passion project, so any help we can get is highly appreciated. Here are some of the ways you can contribute to Schoology Plus:

## Pull Requests
Pull requests are welcomed! If you would like to add a new feature, the best way of doing so is to submit a pull request. All pull requests will be considered and reviewed thoroughly.

## Bug Reports
There are two ways you can report bugs you find in Schoology Plus:

1. Create a detailed [GitHub issue](https://github.com/aopell/SchoologyPlus/issues/new) describing the bug. Please provide detailed **steps to reproduce** and **screenshots** of the issue if applicable.
2. Send a message in the #bugs-and-features channel of our [Discord server](https://aopell.github.io/SchoologyPlus/discord.html).

## Feature Requests
To avoid the problem of issue spam, we'd appreciate if you kept all feature requests in the `#bugs-and-features` channel of our [Discord server](https://aopell.github.io/SchoologyPlus/discord.html). Please **do not create GitHub issues for feature requests**.

## Documentation
If you would like to help write documentation for Schoology Plus, please contact us in either the `#support` or `#bugs-and-features` channel of our [Discord server](https://aopell.github.io/SchoologyPlus/discord.html). We really appreciate all documentation contributions!

## Content
If you would like to submit content for Schoology Plus (including, but not limited to: course icons, themes, and other assets) please contact us in either the `#support` or `#bugs-and-features` channel of our [Discord server](https://aopell.github.io/SchoologyPlus/discord.html).

## Other Contributions
If you can think of another way of contributing to Schoology Plus that isn't listed here, please contact us in our [Discord server](https://aopell.github.io/SchoologyPlus/discord.html)!
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Aaron Opell
Copyright (c) 2017-2019 Aaron Opell

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
78 changes: 42 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,54 @@
[![Chrome Web Store Users](https://img.shields.io/chrome-web-store/users/fbfppoaockpecjpbdmldojdehdpepfef.svg)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
[![Chrome Web Store Rating](https://img.shields.io/chrome-web-store/rating/fbfppoaockpecjpbdmldojdehdpepfef.svg)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
[![Firefox Download](https://img.shields.io/badge/dynamic/json.svg?label=firefox%20download&url=https%3A%2F%2Faopell.me%2FSchoologyPlus%2Fupdate.json&query=%24.addons%5B%27schoology.plus%40aopell.me%27%5D.updates%5B0%5D.version&colorB=orange)](http://aopell.me/SchoologyPlus/firefox-download.html)
[![Discord](https://img.shields.io/discord/526898202495025172.svg?color=7289da&label=discord)](https://aopell.github.io/SchoologyPlus/discord.html)
[![Changelog](https://img.shields.io/github/release/aopell/SchoologyPlus.svg?label=changelog&colorB=lightgrey)](https://aopell.me/SchoologyPlus/changelog)

[![Download for Chrome](https://developer.chrome.com/webstore/images/ChromeWebStore_Badge_v2_206x58.png)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
[<img src="https://imgur.com/hVupcaT.png" height="58" alt="Download for Firefox">](http://aopell.me/SchoologyPlus/firefox-download.html)

# Features

#### Contents
- [Interface Improvements](#interface-improvements)
- [Blue Theme](#blue-theme)
- [Custom Themes](#custom-themes)
- [Course Icons](#course-icons)
- [Tooltips](#tooltips)
- [Courses in Common](#courses-in-common)
- [Miscellaneous Improvements](#miscellaneous-interface-improvements)
- [Grades Page Improvements](#grades-page-improvements)
- [Miscellaneous Improvements](#miscellaneous-grades-page-improvements)
- [Simulated Grades](#simulated-grades)
- [Desktop Notifications](#desktop-notifications)
- [Schoology Plus Announcements](#schoology-plus-announcements)
- [Schoology Plus Settings](#schoology-plus-settings)
- [Theme Editor](#theme-editor)
- [Course Options](#course-options)
- [Custom Grading Scales](#custom-grading-scales)
- [Course Nicknames](#course-nicknames)
- [Features](#features)
- [Interface Improvements](#interface-improvements)
- [Blue Theme](#blue-theme)
- [Custom Themes](#custom-themes)
- [Course Icons](#course-icons)
- [Tooltips](#tooltips)
- [Courses in Common](#courses-in-common)
- [Miscellaneous Improvements](#miscellaneous-interface-improvements)
- [Grades Page Improvements](#grades-page-improvements)
- [Miscellaneous Improvements](#miscellaneous-grades-page-improvements)
- [Simulated Grades](#simulated-grades)
- [Desktop Notifications](#desktop-notifications)
- [Schoology Plus Announcements](#schoology-plus-announcements)
- [Schoology Plus Settings](#schoology-plus-settings)
- [Theme Editor](#theme-editor)
- [Course Options](#course-options)
- [Custom Grading Scales](#custom-grading-scales)
- [Course Nicknames](#course-nicknames)
- [Feedback and Support Discord](#feedback-and-support-discord)
- [Contributing](#contributing)
- [Contributors](#contributors)
- [License](#license)
- [Disclaimer](#disclaimer)

# Features
> ***All features below marked with an asterisk\* can be changed or customized with a setting***
## Interface Improvements
### Blue Theme
![Navigation Bar](https://i.imgur.com/VbTn30Y.png)

*Image: The blue Schology Plus navigation bar*
- Replaces the orange LAUSD theme with a blue theme
- Replaces the default LAUSD theme with a blue theme
- Replaces the LAUSD logo with the Schoology logo
### Custom Themes
![Built-in Themes](https://i.imgur.com/Tjfa5tJ.gif)

*Image: Demonstration of the built-in themes*
- You can create a custom theme or choose one of the small selection of built-in themes (including rainbow mode!)
- One of the built-in themes is the "LAUSD Orange" theme which restores the interface to the LAUSD theme (including the logo)
- Two of the built-in themes are the "LAUSD Dark Blue" and "LAUSD Orange" themes which restore the interface to the new and old versions of the LAUSD theme respectively including the logo)
- Custom themes can change colors throughout the interface as well as the logo and course icons. Custom themes can even use custom rainbow color patterns!
- To learn more about creating custom themes, see [Theme Editor](#theme-editor)
#### Course Icons
![Course Icons](https://imgur.com/KybIeXw.png)
Expand All @@ -65,12 +72,14 @@
### Courses In Common
![Courses in Common](https://imgur.com/0tEgPhh.png)
*Image: Dialog box showing courses in common with another classmate*
- View all courses you share with a classmate
- View all courses you share with a classmate by visiting their profile page

### Miscellaneous Interface Improvements
- Adds a "Grades" link to the navigation bar for easy access from any page
- Adds a button to quickly jump to archived courses in the Courses drop-down list*
- Extends the length of the Courses drop-down list so there is no longer a scroll bar
- Adds option to hide the upcoming and overdue assignments sidebars on the home page*
- Indicates when a class is graded on a weighted scale*
- Changed the courses drop down menu to show 6 courses across instead of 4
- Notice when submitting a quiz when questions are left blank

## Grades Page Improvements
### Miscellaneous Grades Page Improvements
Expand All @@ -79,14 +88,15 @@
- Classes are sorted by period*
- Grades are displayed when classes are collapsed

![Point Totals and Letter Grades](https://i.imgur.com/P0cXa7P.png)
![Point Totals and Letter Grades](https://i.imgur.com/T0hriZt.png)

*Image: Example of point totals for categories and unweighted classes. Also features calculated letter grades.*
*Image: Example of point totals for categories and unweighted classes. Also features calculated letter grades and point buffers.*

- Displays letter grades for classes that don't provide them*
- The specific score needed for each grade can be customized, see [Custom Grading Scales](#custom-grading-scales)
- Point totals are displayed for classes with unweighted categories
- Point totals are displayed for all assignment categories
- Displays point buffers from the next lowest letter grade and number of points needed to reach the next highest letter grade for unweighted classes

![Percentages and Possible Points](https://i.imgur.com/KjWsPjD.png)

Expand Down Expand Up @@ -153,23 +163,19 @@
- They will also show as posts in your news feed*

## Schoology Plus Settings
![Settings](https://i.imgur.com/KwKmsTo.png)
![Settings](https://i.imgur.com/NMrweVB.png)

*Image: The Schoology Plus settings dialog box. Click the (+) button on the navigation bar to open.*

Schoology Plus has the following customizable settings:
Schoology Plus has customizable settings, including but not limited to:
- Theme
- Sets the theme for the Schoology Plus interface. Currently, Schoology Plus has 4 built-in themes and a theme editor for you to make your own.
- Desktop Notifications
- Displays desktop notifications and a number badge on the extension button when new grades are entered
- Announcement Notifications
- Displays desktop notifications and news feed posts for announcements sent to all Schoology Plus users
- Custom Grading Scales
- Uses custom grading scales (set per-course in Course Options) when courses don't have one defined
- Order Classes
- Changes the order of your classes on the grades and mastery pages
- Override Course Icons
- Replace the course icons with the selected theme's icons
- Archived Courses Button
- Shows a button labeled "See Archived" next to the "See All" button in the courses dropdown

Expand All @@ -179,7 +185,7 @@ Schoology Plus has the following customizable settings:

*Image: The theme editor interface with an example of a custom Black and White theme*

Schoology Plus is equipped with a fully-featured theme editor, allowing you to create your own custom theme. The theme editor allows you to preview your changes to the interface, including colors, logos, cursors, and custom icons. To learn more about the theme editor, see the [Theme Editor Help Page](themes/README.md).
Schoology Plus is equipped with a fully-featured theme editor, allowing you to create your own custom theme. The theme editor allows you to preview your changes to the interface, including colors, logos, cursors, and custom icons. To learn more about the theme editor, see the [Theme Editor help page](themes/README.md).

## Course Options

Expand All @@ -193,11 +199,11 @@ Schoology Plus is equipped with a fully-featured theme editor, allowing you to c
- You can create custom grading scales for courses where the teacher does not have a grading scale set for the class.
- This will be used to calculate letter grades for assignment categories and courses on the grades page

# Bug Reports and Feature Requests
Please submit bugs and feature requests using [Github issues](https://github.com/aopell/SchoologyPlus/issues/new). Use an informative title and a clear description of your issue or request. For bugs, please provide **steps to reproduce** and **screenshots** of the issue if applicable. You can submit an issue ticket at any time by clicking the "Submit Feedback" link in the footer of the settings page.
# Feedback and Support Discord
Schoology Plus has a Discord server where you can offer feature suggestions, report bugs, get support, or just talk with other Schoology Plus users. [Click here to join!](https://aopell.github.io/SchoologyPlus/discord.html)

# Contributing
Pull requests are welcomed! If you would like to add a new feature, the best way of doing so is to submit a pull request. All pull requests will be considered and reviewed thoroughly.
Please see [CONTRIBUTING.md](https://github.com/aopell/SchoologyPlus/blob/develop/CONTRIBUTING.md) for information about contributing to Schoology Plus. This document also includes methods for reporting bugs and submitting feature requests.

# Contributors
This extension was created by [Aaron Opell](https://github.com/aopell). Significant development assistance has been provided by [Glen Husman](https://github.com/glen3b). Various other contribution information is located in the Contributors dialog accessible via a link in the footer of Schoology Plus settings.
Expand Down
46 changes: 35 additions & 11 deletions css/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,16 @@ section.sgy-card .sgy-card-lens img.injected-course-icon {
}

.submit-span-wrapper input[type=button],
.submit-span-wrapperinput[type=submit] {
.submit-span-wrapper input[type=submit] {
height: 25px !important;
vertical-align: middle !important;
color: white !important;
}

.submit-span-wrapper {
border: 2px solid var(--border-color) !important;
background-color: var(--primary-color) !important;
background-image: none !important;
}

.submit-span-wrapper:hover {
Expand Down Expand Up @@ -392,22 +394,44 @@ h1.setting-title {
margin-left: 15px;
}

.no-margins {
margin: 0 !important;
}

.small-top-margin {
margin-top: 4px !important;
}

.splus-broadcast-title {
font-size: 14px;
}

#enable-modify {
margin-top: 10px !important;
}

/*
#139 fix
We reskin background but not foreground in .popups-buttons
This overrides our reskin of the background to match other cancellations
Make accept and cancel buttons similarly styled throughout the UI
*/
#popup_cancel {
background-color: rgba(0, 0, 0, 0) !important;
#popup_cancel, .cancel-btn {
background-color: #666 !important;
color: white !important;
}

#popup_cancel:hover, .cancel-btn:hover {
background-color: #444 !important;
}

.cancel-btn {
border: 2px solid var(--border-color) !important;
background-image: none !important;
padding-top: 4px !important;
padding-bottom: 4px !important;
}

/*
In the same vein as #139, to address stylistic discreptancies between the buttons
*/
.popups-buttons span {
border: 1px solid !important;
border-color: #999 #999 #888 !important;
background: url('https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/gray-btn-bg.gif') repeat-x 0 1px !important;
border: none !important;
}

/*
Expand Down
4 changes: 4 additions & 0 deletions js/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ let modals = [
createElement("h3", ["setting-title"], { textContent: "...and more" }),
createElement("p", ["setting-description"], { textContent: "For various ideas and suggestions" })
]),
createElement("div", ["setting-entry"], {}, [
createElement("h2", ["setting-title"], { textContent: "Would you like to contribute?" }),
createElement("p", ["setting-description"], { innerHTML: 'Please see our <a href="https://github.com/aopell/SchoologyPlus/blob/develop/CONTRIBUTING.md">contributing guidelines</a> for various ways you can help in the development of Schoology Plus. Thanks for your interest in contributing!' })
]),
createElement("div", ["setting-entry"], {}, [
createElement("h3", ["setting-title"], { textContent: "Disclaimer" }),
createElement("p", ["setting-description"], { textContent: "Schoology Plus is not affiliated with Schoology Inc. or the Los Angeles Unified School District. Schoology, the SCHOOLOGY® wordmark, and the S logo are registered and unregistered trademarks of Schoology, Inc. in the United States. All product names, logos, and brands are property of their respective owners." })
Expand Down
Loading

0 comments on commit 17058b6

Please sign in to comment.