diff --git a/web/app/assets/javascripts/react-components/AgeRangeList.js.jsx.coffee b/web/app/assets/javascripts/react-components/AgeRangeList.js.jsx.coffee new file mode 100644 index 000000000..1f99cf599 --- /dev/null +++ b/web/app/assets/javascripts/react-components/AgeRangeList.js.jsx.coffee @@ -0,0 +1,20 @@ +context = window +rest = window.JK.Rest() +logger = context.JK.logger + +@AgeRangeList = React.createClass({ + ages: [0, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100] + + componentDidUnmount: () -> + @languages = [] + + componentDidMount: () -> + @agesJsx = [] + for age in @ages + @agesJsx.push(``) + + render: () -> + `` +}) \ No newline at end of file diff --git a/web/app/assets/javascripts/react-components/TeacherSetupBasics.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherSetupBasics.js.jsx.coffee index af0385ac9..fb54c5753 100644 --- a/web/app/assets/javascripts/react-components/TeacherSetupBasics.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/TeacherSetupBasics.js.jsx.coffee @@ -56,6 +56,8 @@ rest = window.JK.Rest() navTo = this.navDestination(e) teacherActions.change.trigger(this.state, {navTo: navTo}) + studentLevelChanged: (level, e) -> + render: () -> # Render the following: # Instruments @@ -65,30 +67,50 @@ rest = window.JK.Rest() # All lists will take a list of selected keys, # and will otherwise self-render the available `
-
+
- Instruments Taught +

Instruments Taught:

-
+
- Music Subjects Taught +

Music Subjects Taught:

-
+
- Genres Taught +

Genres Taught:

-
+
- Languages Spoken +

Languages Spoken:

+
+
+

Student Levels Taught:

+
+ Beginner + Intermediate + Advanced +
+
+
+
+
+

Student Ages Taught:

+
+ + to + +
+
+
` diff --git a/web/app/assets/javascripts/react-components/mixins/TeacherProfileMixin.js.coffee b/web/app/assets/javascripts/react-components/mixins/TeacherProfileMixin.js.coffee index b0ae63636..970061d7c 100644 --- a/web/app/assets/javascripts/react-components/mixins/TeacherProfileMixin.js.coffee +++ b/web/app/assets/javascripts/react-components/mixins/TeacherProfileMixin.js.coffee @@ -8,7 +8,7 @@ teacherActions = window.JK.Actions.Teacher 'beforeShow': @beforeShow } - logger.debug("Binding setup to: teachers/setup/#{@screenName()}") + logger.debug("Binding setup to: teachers/profile/#{@screenName()}") app.bindScreen("teachers/profile/#{@screenName()}", screenBindings) beforeShow: (data) -> diff --git a/web/app/assets/stylesheets/client/teachers.css.scss b/web/app/assets/stylesheets/client/teachers.css.scss index 6612835a8..2f2aa9e89 100644 --- a/web/app/assets/stylesheets/client/teachers.css.scss +++ b/web/app/assets/stylesheets/client/teachers.css.scss @@ -20,6 +20,32 @@ } } + .TeacherSetupBasics { + .teacher-half-column { + margin-top:20px; + } + + .student-levels, .student-ages { + margin-top:20px; + } + input.student-level { + display:inline; + margin-right:10px; + } + span.student-level { + display:inline; + margin-right:30px; + } + select { + width:auto !important; + display:inline !important; + } + .age-to-age { + margin:0 10px; + display:inline; + } + } + label.margined { margin-top: 1em; margin-bottom: 0.25em; @@ -30,6 +56,10 @@ //width: auto !important; } + h3 { + font-size:16px; + } + .teacher-setup-form { padding: 1em; .error-text { @@ -47,10 +77,32 @@ .teacher-quarter-column { @extend .w25; + @include border_box_sizing; + float:left; + padding: 0 10px; + + &:first-child { + padding-left:0; + } + + &:last-child { + padding-right:0; + } } .teacher-half-column { @extend .w50; + @include border_box_sizing; + float:left; + padding: 0 10px; + + &:first-child { + padding-left:0; + } + + &:last-child { + padding-right:0; + } } .teacher-third-column { @@ -61,7 +113,6 @@ padding-right: 1em; } - table.form-table { width: 100%; margin-bottom: 1em; @@ -77,10 +128,8 @@ width: auto; } } - } - .teacher-field { padding: 0.25em; @include border_box_sizing; @@ -125,24 +174,13 @@ height: auto; overflow:hidden; } - - } - - - - } - - - - label { font-size: 1.05em; } - label.strong-label { font-weight: bold; font-size: 1.1em; @@ -154,5 +192,4 @@ margin: 8px 4px 8px 0px; text-transform: uppercase; } - } \ No newline at end of file diff --git a/web/app/views/clients/teachers/profile/_basics.html.slim b/web/app/views/clients/teachers/profile/_basics.html.slim index 1334cccc0..e3fc080ee 100644 --- a/web/app/views/clients/teachers/profile/_basics.html.slim +++ b/web/app/views/clients/teachers/profile/_basics.html.slim @@ -9,5 +9,5 @@ .content-body-scroller form.teacher-setup-form .teacher-setup-step-0.teacher-step.content-wrapper - h2 edit teacher: basics + h2 edit teacher profile: basics = react_component 'TeacherProfileBasics', {}