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.

Sign up for GitHub

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

Jump to bottom

Add customizable announcements section #5

Merged
merged 22 commits into from
Dec 17, 2021
Merged

Add customizable announcements section #5

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c2cd737
Add section about Jupyter for Research
yuvipanda Oct 23, 2020
4fc49b9
Add home page info about support platform
GeorgianaElena Jan 18, 2021
84a3db0
Add login info section about support platform
GeorgianaElena Jan 18, 2021
c9693bd
Merge pull request #3 from GeorgianaElena/support-link
GeorgianaElena Jan 18, 2021
a3980d4
Make the ticketing service clickable
GeorgianaElena Jan 21, 2021
a070bb4
Merge pull request #4 from GeorgianaElena/fix-support-link
GeorgianaElena Jan 21, 2021
b5ca36e
Add info about UToronto Support Website
GeorgianaElena Apr 21, 2021
59d178b
Merge pull request #5 from GeorgianaElena/support-website
GeorgianaElena Apr 21, 2021
69b2f80
Merge branch 'master' of https://github.com/utoronto-2i2c/homepage in…
GeorgianaElena Dec 13, 2021
0802e3e
Make announcements and support info customizable
GeorgianaElena Dec 13, 2021
0e8b0ec
Remove info section under login
GeorgianaElena Dec 14, 2021
2a90330
Try make announcements a list - have no idea if this works
GeorgianaElena Dec 14, 2021
88b0cce
Allow announcements to be HTML
GeorgianaElena Dec 14, 2021
6290c99
Try iterating announcement list
GeorgianaElena Dec 14, 2021
62f0a95
Try some left-right padding for announcment box
GeorgianaElena Dec 14, 2021
ea7fea5
Try instead alling text slightly to the right
GeorgianaElena Dec 14, 2021
633e748
Move announements to the right
GeorgianaElena Dec 14, 2021
fbcfac2
This might make more sense if we want each announcement in their own box
GeorgianaElena Dec 15, 2021
bd8b8d4
Add specific css for the text inside the box
GeorgianaElena Dec 15, 2021
20abb9a
More left padding
GeorgianaElena Dec 15, 2021
c95ab8b
Make margin and padding values multiples of 4
yuvipanda Dec 15, 2021
ec464c5
Make announcements optional
GeorgianaElena Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions extra-assets/css/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,25 @@
color: grey;
}

.announcements {
margin-top: 10px;
yuvipanda marked this conversation as resolved.
Show resolved Hide resolved
}

.announcements > div {
margin-top: 15px;
yuvipanda marked this conversation as resolved.
Show resolved Hide resolved
padding-top: 5px;
yuvipanda marked this conversation as resolved.
Show resolved Hide resolved
padding-bottom: 5px;
border: 2px dotted orange;
}

.questions {
margin-top: 12px;
}

.questions > div {
margin-top: 32px;
padding-top: 16px;
border-top: 2px lightgrey dotted;
padding-bottom: 32px;
border-bottom: 2px lightgrey dotted;
}

.footer {
Expand Down
14 changes: 14 additions & 0 deletions templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
{% endif %}
</div>

<div class="info text-center">
<br>
<i class="fa fa-info-circle"></i>
Use <a href=" {{ custom.support_service.url }}">{{ custom.support_service_name }}</a> to open tickets for support questions.
Copy link
Member

Choose a reason for hiding this comment

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

Let's just make the entire HTML here customizable? So it's just we can have a list of announcements here. Not everyone has a suppert link...

Copy link

Choose a reason for hiding this comment

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

Maybe some custom.help.url and custom.help.text?
Even when not everyone has a "support" link, I would bet everyone has some email address people could/should ping if they have some issue/problem, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I actually thought that we could default to our freshdesk support account? Hmm, but maybe my thinking is not right.
Thinking about it, I believe we concluded to have the hub representative reach out to us and not the regular user

Copy link
Member

Choose a reason for hiding this comment

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

@GeorgianaElena yeah, i think the situation for each hub is different enough that arbitrary HTML here is nice. In the future, we could also perhaps let hub admins set announcements here via the configurator

Copy link
Member Author

Choose a reason for hiding this comment

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

maybe delete this section entirely? (see my comment for the code lines bellow)

Copy link

Choose a reason for hiding this comment

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

Yep, that is the other option, just go with the ANN section, but I still think it is useful to have a "link place" just below the login button...

</div>

<div class="col-md-8 col-md-offset-2 details">
<div class="col-md-6">
<big class="details-welcome lead">
Expand All @@ -82,6 +88,14 @@

</div>

<div class="col-md-8 col-md-offset-2 announcements">
<div>
<h4>{{ custom.announcement.header }}</h4>

{{ custom.announcement.text }}
</div>
</div>

GeorgianaElena marked this conversation as resolved.
Show resolved Hide resolved
<div class="col-md-8 col-md-offset-2 questions">
<div>
<h4>Where can I learn more?</h4>
Expand Down