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

Redesigned UI #210

Merged
merged 19 commits into from
May 9, 2019
Merged

Redesigned UI #210

merged 19 commits into from
May 9, 2019

Conversation

grinnelldennis
Copy link
Contributor

@grinnelldennis grinnelldennis commented Apr 30, 2019

resolves #206 #193

Changes

  • facelifts all client-facing UI to have an updated and cleaner look across all pages
  • introduce a nav-bar and new css button classes that wraps around admin-only buttons in profiles, departments and user > show
  • consistent formatting across all form pages
  • user show page redesigned, now including breadcrumbs and formatting like a department page
  • notices, e.g. "department has been created/edited", now show up nicely in a formatted div

Testing

  1. git checkout fix-formatting
  2. rails s -b $IP -p $PORT
  3. login
  4. poke around the various tabs accessible, make sure the changes described are working

Note

The PR also addresses #203, which is also in a different PR. Ignore that functionality here, and it has been included because other changes have also been made to the users_show

Merge after department/LynBranch

@grinnelldennis grinnelldennis added the DO NOT MERGE Pull requests that are open to review, but still need to be added to label May 1, 2019
@@ -14,7 +14,7 @@ def index
bucket = get_bucket
@results = all_results.map do |profile|
{
:name => profile.last_name + ", " + profile.first_name,
:name => profile_name(profile),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ignore changes in this file, already addressed by another PR

@grinnelldennis grinnelldennis changed the base branch from LynBranch to master May 6, 2019 17:41
@grinnelldennis grinnelldennis removed the DO NOT MERGE Pull requests that are open to review, but still need to be added to label May 6, 2019
Copy link
Contributor

@JohnLennon1997 JohnLennon1997 left a comment

Choose a reason for hiding this comment

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

Everything looks so much better now.

@JohnLennon1997 JohnLennon1997 merged commit 0863e58 into master May 9, 2019
@AlexanderOtavka AlexanderOtavka deleted the fix-formatting branch May 11, 2019 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disallow User from Deleting Their Own Account
2 participants