codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-30 07:53:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate join classroom url to /courses from /courses/students

Browse source
This commit is contained in:
Scott Erickson 2015-12-02 12:05:43 -08:00
parent 6d4c17f724
commit c0b979a572
4 changed files with 6 additions and 4 deletions

2
app/templates/courses/student-sign-up-modal.jade
View file

@ -30,7 +30,7 @@ block modal-body-content
.form-group .form-group
label.control-label(for="class-code-input") label.control-label(for="class-code-input")
span Class Code span Class Code
input#class-code-input.input-large.form-control(name="classCode") input#class-code-input.input-large.form-control(name="classCode", value=view.classCode)
.help-block optional - ask your teacher to give you one! .help-block optional - ask your teacher to give you one!
.form-group .form-group
label.control-label(for="school-input") label.control-label(for="school-input")

2
app/templates/home-view.jade
View file

@ -28,7 +28,7 @@ block outer_content
#hour-of-code #hour-of-code
h1(data-i18n="home.hoc_title") h1(data-i18n="home.hoc_title")
div div
a.btn.btn-illustrated.btn-lg.btn-primary.btn-class-code(href='/courses/students', data-i18n="home.hoc_class_code") a.btn.btn-illustrated.btn-lg.btn-primary.btn-class-code(href='/courses', data-i18n="home.hoc_class_code")
a.btn.btn-illustrated.btn-lg.btn-success.btn-enter(href='/hoc', data-i18n="home.hoc_enter") a.btn.btn-illustrated.btn-lg.btn-success.btn-enter(href='/hoc', data-i18n="home.hoc_enter")
//- #slogan(data-i18n="home.slogan") //- #slogan(data-i18n="home.slogan")

2
app/views/courses/InviteToClassroomModal.coffee
View file

@ -12,7 +12,7 @@ module.exports = class InviteToClassroomModal extends ModalView
initialize: (options) -> initialize: (options) ->
@classroom = options.classroom @classroom = options.classroom
@classCode = @classroom.get('codeCamel') || @classroom.get('code') @classCode = @classroom.get('codeCamel') || @classroom.get('code')
@joinURL = document.location.origin + "/courses/students?_cc=" + @classCode @joinURL = document.location.origin + "/courses?_cc=" + @classCode
onClickSendInvitesButton: -> onClickSendInvitesButton: ->
emails = @$('#invite-emails-textarea').val() emails = @$('#invite-emails-textarea').val()

4
app/views/courses/StudentSignUpModal.coffee
View file

@ -4,6 +4,7 @@ auth = require 'core/auth'
forms = require 'core/forms' forms = require 'core/forms'
User = require 'models/User' User = require 'models/User'
Classroom = require 'models/Classroom' Classroom = require 'models/Classroom'
utils = require 'core/utils'
module.exports = class StudentSignUpModal extends ModalView module.exports = class StudentSignUpModal extends ModalView
id: 'student-sign-up-modal' id: 'student-sign-up-modal'
@ -17,6 +18,7 @@ module.exports = class StudentSignUpModal extends ModalView
initialize: (options) -> initialize: (options) ->
options ?= {} options ?= {}
@willPlay = options.willPlay @willPlay = options.willPlay
@classCode = utils.getQueryVariable('_cc') or ''
onClickSkipLink: -> onClickSkipLink: ->
@trigger 'click-skip-link' # defer to view that opened this modal @trigger 'click-skip-link' # defer to view that opened this modal
@ -89,6 +91,6 @@ module.exports = class StudentSignUpModal extends ModalView
onCreateUserSuccess: => onCreateUserSuccess: =>
classCode = @$('#class-code-input').val() classCode = @$('#class-code-input').val()
if classCode if classCode
url = "/courses/students?_cc="+classCode url = "/courses?_cc="+classCode
application.router.navigate(url) application.router.navigate(url)
window.location.reload() window.location.reload()