-
-
Notifications
You must be signed in to change notification settings - Fork 89
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
Implement conditional navbar for pages #694
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
764e6d7
Implement conditionals for navbars
NPDebs 9a96886
Create new navbar for openseeds
NPDebs b8980c6
Rename new openseeds navbar to header
NPDebs 5e1334c
Link to "OLS" index page from the openseeds navbar
NPDebs 11e92cb
Update "Policies" nav item to link to code-of-conduct page
NPDebs 2bb8c5a
Update "Policies" navbar item to link to code-of-conduct.md
NPDebs 78fb2de
Move "about" page into openseeds folder
NPDebs 85e47d0
Adjust path to about page within openseeds folder
NPDebs 1e10243
Adjust path to about page; remove OLS-8 from nav
NPDebs 2f2621b
Make library a separate item; add Cohorts dropdown
NPDebs 4330c56
Remove openseeds info & add 3 pillars to navbar
NPDebs c18c0ab
Update _includes/default-header.html
NPDebs 592c5f7
Update _includes/default-header.html
NPDebs 48d527c
Update _includes/default-header.html
NPDebs a44a3fd
Update _includes/default-header.html
NPDebs 8aea534
Update _includes/default-header.html
NPDebs d8eb30d
Update _includes/default-header.html
NPDebs 9e8f240
Update _includes/default-header.html
NPDebs 1726fc8
Merge branch 'open-life-science:main' into conditional_nav
NPDebs d0b39aa
Make some changes to the navbar
bebatut f6fb150
Move video library to openseeds
bebatut File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
<nav class="navbar is-fixed-top" role="navigation" aria-label="main navigation"> | ||
<div class="container"> | ||
<div class="navbar-brand"> | ||
<a class="navbar-item" href="{% link openseeds/index.md %}"> | ||
<img src="/images/logo.png" alt="OLS"> | ||
</a> | ||
<a | ||
role="button" | ||
class="navbar-burger burger" | ||
aria-label="menu" | ||
aria-expanded="false" | ||
data-target="top-menu" | ||
> | ||
<span aria-hidden="true"></span> <span aria-hidden="true"></span> | ||
<span aria-hidden="true"></span> | ||
</a> | ||
</div> | ||
|
||
<div id="top-menu" class="navbar-menu"> | ||
<div class="navbar-end"> | ||
<div class="navbar-item has-dropdown is-hoverable"> | ||
<a class="navbar-link" href="{% link openseeds/about.md %}">The Program</a> | ||
<div class="navbar-dropdown"> | ||
<a class="navbar-item" href="{% link openseeds/index.md %}#applications"> Applications </a> | ||
<a class="navbar-item" href="{% link openseeds/about.md %}#projects"> Projects </a> | ||
<a class="navbar-item navbar-previous-title" href="{% link openseeds/about.md %}#the-roles"> Role description </a> | ||
<a class="navbar-item" href="{% link openseeds/about.md %}#mentees"> Mentees </a> | ||
<a class="navbar-item" href="{% link openseeds/about.md %}#mentors"> Mentors </a> | ||
<a class="navbar-item" href="{% link openseeds/about.md %}#experts"> Experts </a> | ||
<a class="navbar-item" href="{% link openseeds/about.md %}#facilitators"> Facilitators </a> | ||
</div> | ||
</div> | ||
|
||
<div class="navbar-item has-dropdown is-hoverable"> | ||
<a class="navbar-link" href="{% link openseeds/index.md %}#cohorts">Cohorts</a> | ||
<div class="navbar-dropdown"> | ||
<a class="navbar-item navbar-previous-title" href="{% link openseeds/ols-8/index.md %}">OLS-8</a> | ||
<a class="navbar-item" href="{% link openseeds/ols-8/index.md %}"> Syllabus </a> | ||
<a class="navbar-item" href="{% link openseeds/ols-8/schedule.md %}"> Schedule</a> | ||
<a class="navbar-item" href="{% link openseeds/ols-8/projects-participants.md %}"> Projects & Participants</a> | ||
<a class="navbar-item" href="{% link openseeds/ols-8/index.md %}#mentors"> Mentors & Experts </a> | ||
<a class="navbar-item navbar-previous-title" href="{% link openseeds/index.md %}#cohorts"> Previous cohorts </a> | ||
</div> | ||
</div> | ||
|
||
<a class="navbar-item" href="{% link openseeds/library.md %}"> Video Library </a> | ||
|
||
<div class="navbar-item has-dropdown is-hoverable"> | ||
<a class="navbar-link">About</a> | ||
<div class="navbar-dropdown"> | ||
<a class="navbar-item" href="{% link index.md %}">OLS</a> | ||
<a class="navbar-item" href="{% link people.md %}"> People </a> | ||
<a class="navbar-item" href="{% link community.md %}"> Team </a> | ||
<a class="navbar-item" href="{% link funders.md %}"> Funding & Supporters </a> | ||
<a class="navbar-item" href="{% link partners.md %}"> Partners </a> | ||
<a class="navbar-item" href="{% link publications.md %}"> Citing OLS & Publications </a> | ||
<!--<a class="navbar-item" href="/events"> Events </a>--> | ||
</div> | ||
</div> | ||
|
||
<div class="navbar-item has-dropdown is-hoverable"> | ||
NPDebs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<a class="navbar-link" href="{% link code-of-conduct.md %}">Policies</a> | ||
<div class="navbar-dropdown"> | ||
<a class="navbar-item" href="{{ site.github.owner_url }}/policies-procedures-and-docs/blob/main/CODE_OF_CONDUCT.md"> Code of Conduct </a> | ||
</div> | ||
</div> | ||
|
||
<a class="navbar-item" href="{% link posts.md %}"> Stories </a> | ||
</div> | ||
</div> | ||
</div> | ||
</nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
--- | ||
layout: base | ||
--- | ||
|
||
{% include _includes/default-header.html %} | ||
{% if page.url contains "/openseeds/" %} | ||
{% include _includes/openseeds-header.html %} | ||
{% else %} | ||
{% include _includes/default-header.html %} | ||
{% endif %} | ||
{{ content }} | ||
{% include _includes/default-footer.html %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be good to modify the navbar above.
OLS-8 should be maybe removed. We could also then have a menu for each of the 3 pillars
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Definitely! I have just added a new navbar dropdown that contains our 3 pillars.
Since this captures the consulting service as well (under open incubator), I think we can remove the Services navbar-link. What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.