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

Issue 732 study group prompt login #736

Merged
merged 9 commits into from Nov 24, 2017
Merged

Issue 732 study group prompt login #736

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ff72f2
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 19, 2017
b2e11f9
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 19, 2017
f6b6d27
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 20, 2017
24da525
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 22, 2017
bddf7a2
Show sign in with slack popup when attempting to create a new study g…
railsstudent Nov 22, 2017
3c9e17f
Incorporate code feedback
railsstudent Nov 23, 2017
4c5db3a
Fix copy and paste error.
railsstudent Nov 23, 2017
39fd9a0
Update all_study_groups.html
railsstudent Nov 23, 2017
b152179
Remove blank character in id attribute of create study group button
railsstudent Nov 23, 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
2 changes: 1 addition & 1 deletion client/templates/study_groups/all_study_groups.html
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<div class="row">
<div class="col-md-12 align-center">
<h2>Study Groups</h2>
<div class="btn btn-cb2" id="createGroupButton"> {{_ "start_new_group"}} </div>
<div class="btn btn-cb2 {{#unless currentUser}} continue-popup {{/unless}}" id="createGroupButton"> {{_ "start_new_group"}} </div>
Copy link
Member

Choose a reason for hiding this comment

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

Please add this id="{{#if currentUser}}createGroupButton{{/if}}". and we won't be needing a
if (Meteor.userId()) { block in our helper function.
Thanks.

</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion client/templates/study_groups/all_study_groups.js
View file
Open in desktop
Expand Up @@ -78,6 +78,8 @@ Template.allStudyGroups.events({
template.studyGroupsFilter.set(studyGroupsFilter);
},
'click #createGroupButton': function(event) {
Modal.show('newStudyGroupModal');
if (Meteor.userId()) {
Modal.show('newStudyGroupModal');
}
}
});