mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-03-14 07:00:01 -04:00
Fix some button child click and duplicate tag issues with e284ec79
This commit is contained in:
Nick Winter
parent
0945e3ee90
commit
591749de15
5 changed files with 28 additions and 27 deletions
|
|
@ -1013,7 +1013,6 @@
|
|||
ready_for_more_3: "Learn even more programming!"
|
||||
saved_games: "Saved Games"
|
||||
hoc: "Hour of Code"
|
||||
change_language: "change language"
|
||||
my_classes: "My Classes"
|
||||
class_added: "Class successfully added!"
|
||||
view_class: "view class"
|
||||
|
|
@ -1056,7 +1055,7 @@
|
|||
keep_student: "Keep Student"
|
||||
removing_user: "Removing user"
|
||||
to_join_ask: "To join a class, ask your teacher for an unlock code."
|
||||
join_class: "Join Class"
|
||||
join_this_class: "Join Class"
|
||||
enter_here: "<enter unlock code here>"
|
||||
successfully_joined: "Successfully joined"
|
||||
click_to_start: "Click here to start taking"
|
||||
|
|
@ -1076,15 +1075,15 @@
|
|||
getting_started_1: "Create a new class by clicking the green 'Create New Class' button below."
|
||||
getting_started_2: "Once you've created a class, click the blue 'Add Students' button."
|
||||
getting_started_3: "You'll see student's progress below as they sign up and join your class."
|
||||
addicional_resources: "Additional Resources"
|
||||
addicional_resources_1_pref: "Download/print our"
|
||||
addicional_resources_1_mid: "Course 1 Teacher's Guide"
|
||||
addicional_resources_1_suff: "explanations and solutions to each level."
|
||||
addicional_resources_2_pref: "Complete our"
|
||||
addicional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
|
||||
addicional_resources_3_pref: "Visit our"
|
||||
addicional_resources_3_mid: "Teacher Forums"
|
||||
addicional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
|
||||
additional_resources: "Additional Resources"
|
||||
additional_resources_1_pref: "Download/print our"
|
||||
additional_resources_1_mid: "Course 1 Teacher's Guide"
|
||||
additional_resources_1_suff: "explanations and solutions to each level."
|
||||
additional_resources_2_pref: "Complete our"
|
||||
additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
|
||||
additional_resources_3_pref: "Visit our"
|
||||
additional_resources_3_mid: "Teacher Forums"
|
||||
additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
|
||||
your_classes: "Your Classes"
|
||||
no_classes: "No classes yet!"
|
||||
create_new_class1: "create new class"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ block content
|
|||
#join-classroom-form.form-horizontal
|
||||
.form-group
|
||||
.col-sm-2
|
||||
button#join-class-btn.btn.btn-default.btn-block(disabled=view.state==='enrolling', data-i18n="courses.join_class")
|
||||
button#join-class-btn.btn.btn-default.btn-block(disabled=view.state==='enrolling', data-i18n="courses.join_this_class")
|
||||
.col-sm-6
|
||||
input#classroom-code-input.form-control(
|
||||
data-i18n="[placeholder]courses.enter_here",
|
||||
|
|
|
|||
|
|
@ -29,20 +29,20 @@ block content
|
|||
li(data-i18n="courses.getting_started_3")
|
||||
br
|
||||
.text-center
|
||||
strong(data-i18n="courses.addicional_resources")
|
||||
strong(data-i18n="courses.additional_resources")
|
||||
ul
|
||||
li
|
||||
span.spr(data-i18n="courses.addicional_resources_1_pref")
|
||||
a(href='http://codecombat.com/docs/CodeCombatTeacherGuideCourse1.pdf', data-i18n="courses.addicional_resources_1_mid")
|
||||
span.spl(data-i18n="courses.addicional_resources_1_suff")
|
||||
span.spr(data-i18n="courses.additional_resources_1_pref")
|
||||
a(href='http://codecombat.com/docs/CodeCombatTeacherGuideCourse1.pdf', data-i18n="courses.additional_resources_1_mid")
|
||||
span.spl(data-i18n="courses.additional_resources_1_suff")
|
||||
li
|
||||
span.spr(data-i18n="courses.addicional_resources_2_pref")
|
||||
span.spr(data-i18n="courses.additional_resources_2_pref")
|
||||
a(href='/teachers/freetrial', data-i18n="teachers_survey.title")
|
||||
span.spl(data-i18n="courses.addicional_resources_2_suff")
|
||||
span.spl(data-i18n="courses.additional_resources_2_suff")
|
||||
li
|
||||
span.spr(data-i18n="courses.addicional_resources_3_pref")
|
||||
a(href='http://discourse.codecombat.com/c/teachers', data-i18n="courses.addicional_resources_3_mid")
|
||||
span.spl(data-i18n="courses.addicional_resources_3_suff")
|
||||
span.spr(data-i18n="courses.additional_resources_3_pref")
|
||||
a(href='http://discourse.codecombat.com/c/teachers', data-i18n="courses.additional_resources_3_mid")
|
||||
span.spl(data-i18n="courses.additional_resources_3_suff")
|
||||
|
||||
.section-header(data-i18n="courses.your_classes")
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ module.exports = class ChangeCourseLanguageModal extends ModalView
|
|||
'click .lang-choice-btn': 'onClickLanguageChoiceButton'
|
||||
|
||||
onClickLanguageChoiceButton: (e) ->
|
||||
@chosenLanguage = $(e.target).data('language')
|
||||
@chosenLanguage = $(e.target).closest('.lang-choice-btn').data('language')
|
||||
aceConfig = _.clone(me.get('aceConfig') or {})
|
||||
aceConfig.language = @chosenLanguage
|
||||
me.set('aceConfig', aceConfig)
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ module.exports = class ClassroomView extends RootView
|
|||
application.tracker?.trackEvent 'Classroom started enroll students', category: 'Courses'
|
||||
|
||||
onClickActivateSingleLicenseButton: (e) ->
|
||||
userID = $(e.target).data('user-id')
|
||||
userID = $(e.target).closest('.btn').data('user-id')
|
||||
user = @users.get(userID)
|
||||
modal = new ActivateLicensesModal({
|
||||
classroom: @classroom
|
||||
|
|
@ -148,7 +148,7 @@ module.exports = class ClassroomView extends RootView
|
|||
stats.totalPlaytime = if playtime then moment.duration(playtime, "seconds").humanize() else 0
|
||||
|
||||
completeSessions = @sessions.filter (s) -> s.get('state')?.complete
|
||||
stats.averageLevelsComplete = if @users.size() then (_.size(completeSessions) / @users.size()).toFixed(1) else 'N/A'
|
||||
stats.averageLevelsComplete = if @users.size() then (_.size(completeSessions) / @users.size()).toFixed(1) else 'N/A' # '
|
||||
stats.totalLevelsComplete = _.size(completeSessions)
|
||||
|
||||
enrolledUsers = @users.filter (user) -> user.get('coursePrepaidID')
|
||||
|
|
@ -161,9 +161,11 @@ module.exports = class ClassroomView extends RootView
|
|||
application.tracker?.trackEvent 'Classroom started add students', category: 'Courses', classroomID: @classroom.id
|
||||
|
||||
onClickEnableButton: (e) ->
|
||||
courseInstance = @courseInstances.get($(e.target).data('course-instance-cid'))
|
||||
userID = $(e.target).data('user-id')
|
||||
$(e.target).attr('disabled', true)
|
||||
$button = $(e.target).closest('.btn')
|
||||
courseInstance = @courseInstances.get($button.data('course-instance-cid'))
|
||||
console.log 'looking for course instance', courseInstance, 'for', $button.data('course-instance-cid'), 'out of', @courseInstances
|
||||
userID = $button.data('user-id')
|
||||
$button.attr('disabled', true)
|
||||
application.tracker?.trackEvent 'Course assign student', category: 'Courses', courseInstanceID: courseInstance.id, userID: userID
|
||||
|
||||
onCourseInstanceCreated = =>
|
||||
|
|
|
|||
Loading…
Reference in a new issue