Skip to content

Levy iss01 #2

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

Open
PatrickLevy wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Levy iss01 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78ce5eb
small change to readme file
Apr 1, 2015
e9c092c
Bug fix for missing username in home view
Apr 8, 2015
3c24eab
bug fix - incorrect profile name display
Apr 10, 2015
14170fb
bug fix attempt 2 - incorrect profile name display in home view
Apr 10, 2015
067db6f
used spacebars syntax to locate current user's profile
Apr 13, 2015
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FEATURES
INCLUDED FEATURES
-------
* √ - Teacher logs in and creates a "chatter" topic.
* √ - Teacher distributes a short code for the "chatter" topic to students.
Expand Down
6 changes: 4 additions & 2 deletions client/views/dashboard/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<template name="Dashboard">
{{#with currentUser}}
<h2>
Welcome, {{currentUser.profile.name}}
Welcome, {{userName _id}}
<a href="{{pathFor 'signOut'}}" class="btn btn-link">Sign out</a>
</h2>

{{/with}}

{{#with accountStatus}}
<div class="alert alert-warning">Your current account status: <span class="{{styleClass}}">{{label}}</span></div>
{{/with}}
Expand Down
6 changes: 4 additions & 2 deletions packages/login/client/templates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@
</div>
</form>
{{else}}
<h3 style="font-weight: 300;">Hello, {{userName}}.</h3>
<a href="{{pathFor 'signOut'}}">Not {{userName}}? Sign out.</a>
{{#with currentUser}}
<h3 style="font-weight: 300;">Hello, {{userName _id}}.</h3>
<a href="{{pathFor 'signOut'}}">Not {{userName _id}}? Sign out.</a>
<div style="margin: 2em 0;">
<a href="{{pathFor 'chatters.index'}}" class="btn btn-success">Jump to Chatter Topics</a>
</div>
{{/with}}
{{/unless}}
</div>
</template>
Expand Down