Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stanford template override stuff #2607

Merged
merged 13 commits into from
Apr 17, 2019
Merged

Stanford template override stuff #2607

merged 13 commits into from
Apr 17, 2019

Conversation

willgearty
Copy link
Member

@willgearty willgearty commented Aug 24, 2018

This is a work in progress of integrating lots of Stanford template override changes into main, since a number of them are useful for other sites. Some of these are fixes, some are additions, and some might not even be useful, but I tried to include whatever I thought my be good for main. I've still got a couple big template overrides, but this covers all of the smaller things.

@benjaminjkraft
Copy link
Contributor

A lot of these look good; I'll take a closer look later. To aid in reviewing, it might be helpful to post screenshots of some of these changes -- especially the CSS where the effect may be less obvious -- with another theme(s) enabled.

@willgearty
Copy link
Member Author

willgearty commented Aug 26, 2018

Here is a screenshot of the changes to the teacher events manage page:

image

@willgearty
Copy link
Member Author

Here's what the student schedule now looks like:

image

@willgearty
Copy link
Member Author

Here's what the "Classes Taught" section of userview looks like:

image

@willgearty
Copy link
Member Author

The float: none additions may only be applicable to the Stanford theme, since part of our theme wants to push some of those buttons to the right via float: right, but I figured it would be good to just make sure they aren't getting moved in other themes.
Another thing I noticed (e.g. on the teacherbio page), is that the circles theme uses a blue color for visited links, so any time an <a> tag is used with the btn-primary class, it's hard to see the text in the button.

Otherwise, happy to provide examples of anything else!

Copy link
Contributor

@benjaminjkraft benjaminjkraft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Lots of good stuff in here. There are enough questions that we probably need another round, but feel free to bug me about this one, since it touches enough things that it will bitrot pretty fast (there's already a merge conflict).

@willgearty
Copy link
Member Author

This should be good for a final review @benjaminjkraft !

@@ -30,6 +30,9 @@ <h1>User Information</h1>
{% endfor %}
</select>
</form>
{% if profile.teacher_info %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't catch my account, which is a teacher & student & admin. It catches people who are just teachers, but if we want to include this we should probably make it catch the case of teacher being just one of the roles?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(same with line 97 though)

Copy link
Member Author

@willgearty willgearty Apr 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm...this is probably a broader issue related to how profiles and contact infos work, but I should be able to fix this by just doing something like {% if "Teacher" in user.getUserTypes %}.

Copy link
Member Author

@willgearty willgearty Apr 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(And do the same for all the other user type conditionals)

Copy link
Contributor

@kkbrum kkbrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added one comment on part of the code that could be improved, but it's not really an issue due to your template changes or anything-- just something I noticed that existed before as well.

Everything looks good to go for me! I only checked on bigpicture theme though and didn't look at survey or lottery things since I have never really used them. Let me know if you'd like me to check anything more carefully.

@willgearty willgearty merged commit 09ff26d into main Apr 17, 2019
@willgearty willgearty deleted the stanford-templates branch April 17, 2019 15:38
willgearty added a commit that referenced this pull request Apr 17, 2019
willgearty added a commit that referenced this pull request May 22, 2019
* Placeholders for SR11 release notes

* Included guardian AUL info

* Added credit card charge name and login fixes

* Add miscellaneous fixes, list PRs for major improvements

* formatting tweaks

* change heading

* list of known issues

* Known issues documentation

* class search docs

* Userview docs

* resource docs

* onsite docs

* QSD/comm panel docs

* Typos

* Convert to code

* More code

* Documentation for #2702

* Docs for #2698 and #2703

* Added known issue from #2670

* Update duration documentation

* Docs for #2711 and #2712, new category

* Email and scheduling assistant docs

* Docs for #2681

* Add doc for issue 2701

* Fix link

* Doc for #2695

* Docs for #2641

* Docs for #2607

* Docs for #2714.

* Docs for #2719 and #2723

* Add AUL documentation for teacher grad year/school

* add english-fixes changes

* Fix language docs

* Docs for #2622

* Docs for #2739

* Docs for #2724, #2740, and #2742

* Docs for #2743, #2747, #2749, and #2750

* Created more sections to make it easier to skim

* Standardized capitalization

* Update known issues to match sr11 bug fixes milestone

* Final edits before SR11

* Update release date
milescalabresi pushed a commit that referenced this pull request Jun 3, 2019
* First pass of Stanford template overrides

* teacherbio changes

* userview_class_entry changes

* student_schedule changes

* https fix

* event_signup changes

* profiles changes

* some things don't transfer to other themes

* manageclass tweaks

* Revert teacher event signup

* Changes for review
milescalabresi pushed a commit that referenced this pull request Jun 3, 2019
* Placeholders for SR11 release notes

* Included guardian AUL info

* Added credit card charge name and login fixes

* Add miscellaneous fixes, list PRs for major improvements

* formatting tweaks

* change heading

* list of known issues

* Known issues documentation

* class search docs

* Userview docs

* resource docs

* onsite docs

* QSD/comm panel docs

* Typos

* Convert to code

* More code

* Documentation for #2702

* Docs for #2698 and #2703

* Added known issue from #2670

* Update duration documentation

* Docs for #2711 and #2712, new category

* Email and scheduling assistant docs

* Docs for #2681

* Add doc for issue 2701

* Fix link

* Doc for #2695

* Docs for #2641

* Docs for #2607

* Docs for #2714.

* Docs for #2719 and #2723

* Add AUL documentation for teacher grad year/school

* add english-fixes changes

* Fix language docs

* Docs for #2622

* Docs for #2739

* Docs for #2724, #2740, and #2742

* Docs for #2743, #2747, #2749, and #2750

* Created more sections to make it easier to skim

* Standardized capitalization

* Update known issues to match sr11 bug fixes milestone

* Final edits before SR11

* Update release date
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants