From 538e48e23727efe61a67260c4f863c28a1573088 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 19 Aug 2015 17:56:44 -0700 Subject: [PATCH] start updating showZiplineOrBasejump view to function post-angular --- .../coursewares/showZiplineOrBasejump.jade | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade index 6bd38d9737..9954957919 100644 --- a/server/views/coursewares/showZiplineOrBasejump.jade +++ b/server/views/coursewares/showZiplineOrBasejump.jade @@ -64,32 +64,25 @@ block content .modal-content .modal-header.challenge-list-header= compliment a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × - .modal-body(ng-controller="pairedWithController") + .modal-body .text-center .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if (user) - form.form-horizontal(novalidate='novalidate', name='completedWithForm') + form.form-horizontal(name='completedWithForm', id='basejump-or-zipline-submit-form') .form-group.text-center .col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2.animated.fadeIn // extra field to distract password tools like lastpass from injecting css into our username field - input.form-control(ng-show="false") - if (challengeType === 3) - input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://codepen.io/your-pen-here", autofocus, required, ng-minlength="10", ng-model="deploymentUrl") + input.form-control.hidden + if (challengeType === "4") + input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://yourapp.herokuapp.com", autofocus, required) + input.form-control#github-url(type='url', name="githubUrl", placeholder="http://github.com/camper/project", required) else - input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://yourapp.com", autofocus, required, ng-minlength="10", ng-model="deploymentUrl") - input.form-control#github-url(name="githubUrl", placeholder="http://github.com/camper/project", ng-model="githubUrl") - - input.form-control#completed-with(name="existingUser", ng-minlength placeholder="If you paired, enter your pair's username here", existing-username='', ng-model="existingUser") - .col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0") - alert(type='danger') - span.ion-close-circled - | Username not found - - if (user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge (ctrl + enter) + input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://codepen.io/your-pen-here", autofocus, required) + input.form-control#completed-with(name="existingUser", placeholder="If you paired, enter your pair's username here") + button.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, type='submit') Go to my next challenge (ctrl + enter) script. - $('#complete-zipline-or-basejump-dialog').on('keypress', modalControlEnterHandler); + $('#complete-zipline-or-basejump-dialog').on('keypress', modalControlEnterHandler); else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress script.