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

Jump to bottom

Issue 654 navbar reorganization #658

Merged
merged 8 commits into from Oct 14, 2017
Merged

Issue 654 navbar reorganization #658

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55892c0
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Oct 5, 2017
75e9af6
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Oct 6, 2017
ac199e6
Merge branch 'staging' of github.com:codebuddiesdotorg/codebuddies in…
railsstudent Oct 8, 2017
8a13a54
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Oct 10, 2017
d7f7a61
Add community dropddown menu
railsstudent Oct 14, 2017
1dfa362
654-navbar-reorganization:
railsstudent Oct 14, 2017
d9e4b7b
Fixes 654. Remove github and slack link from user menu
railsstudent Oct 14, 2017
3380504
Update header.html
lpatmo Oct 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 35 additions & 12 deletions client/templates/nav/header.html
View file
Open in desktop
Expand Up @@ -16,23 +16,48 @@
<div class="collapse navbar-collapse" id="cb2-navbar-collapse">
<ul class="nav navbar-nav navbar-right">

<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Community<span class="caret"></span>
</a>
<ul class="dropdown-menu fa-ul">
<li><a href="{{pathFor 'about'}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i>
{{_ "about"}}<span class="sr-only">(current)</span>
</a></li>
<li role="separator" class="divider"></li>
<li><a href="https://codebuddies.slack.com" target="_blank">
<i class="fa fa-slack fa-fw" aria-hidden="true"></i>Slack
</a></li>
<li role="separator" class="divider"></li>
<li><a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank">
<i class="fa fa-github fa-fw" aria-hidden="true"></i>Github
</a></li>
<li role="separator" class="divider"></li>
<li><a href="https://medium.com/codebuddies" target="_blank">
<i class="fa fa-medium fa-fw" aria-hidden="true"></i>Blog
</a></li>
<li role="separator" class="divider"></li>
<li><a href="{{pathFor 'faq'}}">
<i class="fa fa-question fa-fw" aria-hidden="true"></i>{{_ "faq"}}
</a></li>
<li role="separator" class="divider"></li>
<li><a href="https://opencollective.com/codebuddies" target="_blank">
<i class="fa fa-globe fa-fw" aria-hidden="true"></i>Open Collective
</a></li>
</ul>
</li>
<!-- Hangouts -->
<li><a href="{{pathFor 'hangouts'}}">{{_ "browse_hangouts"}} <span class="sr-only">(current)</span></a></li>
<!-- Study Groups -->
<li><a href="{{pathFor 'all study groups'}}">Study Groups</a></li>

{{! for visitors only}}
{{#unless currentUser}}
<li><a href="{{pathFor 'about'}}">{{_ "about"}} <span class="sr-only">(current)</span></a></li>
<li><a href="{{pathFor 'faq'}}">{{_ "faq"}}</a></li>
<!-- Hangouts -->
<li><a href="{{pathFor 'hangouts'}}">{{_ "browse_hangouts"}} <span class="sr-only">(current)</span></a></li>
<!-- Study Groups -->
<li><a href="{{pathFor 'all study groups'}}">Study Groups</a></li>

<li><a href="#" class="signIn"><button class="btn btn-slack"><img src="/images/slack-icon.png">&nbsp;&nbsp;{{_ "sign_in_with"}} <b>Slack</b></button></a></li>

{{! for logged in user}}
{{else}}
<!-- Hangouts -->
<li><a href="{{pathFor 'hangouts'}}">{{_ "browse_hangouts"}} <span class="sr-only">(current)</span></a></li>
<!-- Study Groups -->
<li><a href="{{pathFor 'all study groups'}}">Study Groups</a></li>

{{! won't be visible to cb admin}}
{{#unless isInRole 'admin' 'CB'}}
Expand All @@ -58,8 +83,6 @@
<ul class="dropdown-menu" role="menu">
<li><a href="{{pathFor 'my study groups'}}"><i class="fa fa-users fa-fw"></i> {{_ "my_study_groups"}}</a></li>
<li><a href="/profile/{{user.username}}/{{user._id}}"><i class="fa fa-user fa-fw"></i> {{_ "profile"}}</a></li>
<li><a href="http://github.com/codebuddiesdotorg/codebuddies"><i class="fa fa-github fa-fw"></i> Github</a></li>
<li><a href="https://codebuddies.slack.com/messages/general" target="_blank"><i class="fa fa-slack fa-fw" aria-hidden="true"></i> Slack</a></li>
<li><a href="{{pathFor 'account' name=user.username userId=user._id}}"><i class="fa fa-gear fa-fw"></i> {{_ "settings"}}</a></li>
<li><a href="#" id="signOut"><i class="fa fa-sign-out fa-fw"></i> {{_ "sign_out"}}</a></li>
</ul>
Expand Down