From 85510a2fd814dbe8b1f50548e665f6fcbe5dfeb9 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 4 Dec 2015 18:24:09 -0800 Subject: [PATCH] Remove directives from views --- server/views/coursewares/showJS.jade | 2 +- server/views/coursewares/showVideo.jade | 2 +- server/views/layout-wide.jade | 2 +- server/views/layout.jade | 2 +- server/views/stories/preliminary-submit.jade | 8 ++++---- server/views/stories/submit-story.jade | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index f630881d16..3b4c1131b4 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -4,7 +4,7 @@ block content link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css') link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css') link(rel='stylesheet', href='/css/ubuntu.css') - .row(ng-controller="pairedWithController") + .row .col-md-4.col-lg-3 .scroll-locker(id = "scroll-locker") .innerMarginFix(style = "width: 99%;") diff --git a/server/views/coursewares/showVideo.jade b/server/views/coursewares/showVideo.jade index 2368076288..df8d00dc92 100644 --- a/server/views/coursewares/showVideo.jade +++ b/server/views/coursewares/showVideo.jade @@ -44,7 +44,7 @@ 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 span.completion-icon.ion-checkmark-circled.text-primary diff --git a/server/views/layout-wide.jade b/server/views/layout-wide.jade index 2996712464..df33c7b4aa 100644 --- a/server/views/layout-wide.jade +++ b/server/views/layout-wide.jade @@ -1,5 +1,5 @@ doctype html -html(ng-app='profileValidation', lang='en') +html(lang='en') head include partials/meta include partials/stylesheets diff --git a/server/views/layout.jade b/server/views/layout.jade index 5c23b7361e..f64024fdf9 100644 --- a/server/views/layout.jade +++ b/server/views/layout.jade @@ -1,5 +1,5 @@ doctype html -html(ng-app='profileValidation', lang='en') +html(lang='en') head include partials/meta include partials/stylesheets diff --git a/server/views/stories/preliminary-submit.jade b/server/views/stories/preliminary-submit.jade index 082f27cec5..495f961c9b 100644 --- a/server/views/stories/preliminary-submit.jade +++ b/server/views/stories/preliminary-submit.jade @@ -1,10 +1,10 @@ .col-xs-12 - div(ng-controller="URLSubmitController") + div form.input-group(name='URLSubmit') - input#story-url.big-text-field.field-responsive.form-control(placeholder='Paste your link here', name='link', type='url', ng-model='possibleURL', required='required', autofocus) + input#story-url.big-text-field.field-responsive.form-control(placeholder='Paste your link here', name='link', type='url', required='required', autofocus) span.input-group-btn - button#preliminary-story-submit.btn.btn-big.btn-primary.btn-responsive(type='button', ng-disabled='URLSubmit.link.$invalid') Submit - div(ng-show="URLSubmit.link.$error.url && !URLsubmit.link.$pristine") + button#preliminary-story-submit.btn.btn-big.btn-primary.btn-responsive(type='button') Submit + div alert(type='danger') span.ion-close-circled | Please enter a valid URL format (http://www.example.com/). diff --git a/server/views/stories/submit-story.jade b/server/views/stories/submit-story.jade index 71b36b3e9c..136f37c106 100644 --- a/server/views/stories/submit-story.jade +++ b/server/views/stories/submit-story.jade @@ -13,14 +13,14 @@ .col-xs-12.col-md-1 label.control-label.control-label-story-submission(for='name') Link .col-xs-12.col-md-11 - input#story-url.form-control(name='Link', ng-model='submitStory.url', disabled="disabled", ng-init='submitStory.url="#{storyURL}"') + input#story-url.form-control(name='Link', disabled="disabled") .form-group .col-xs-12.col-md-1 label.control-label.control-label-story-submission(for='name') Title .col-xs-12.col-md-11 - input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90' ng-model='submitStory.title',required='required', autocomplete="off", ng-init='submitStory.title="#{storyTitle}"' autofocus) - .col-xs-12.col-md-11.col-md-offset-1(ng-cloak, ng-show="submitStory.title.$error.required") + input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90', required='required', autocomplete="off", autofocus) + .col-xs-12.col-md-11.col-md-offset-1 alert(type='danger') span.ion-close-circled | A headline is required to submit. @@ -40,7 +40,7 @@ .row .form-group - button.btn.btn-big.btn-block.btn-primary#story-submit(type='submit', ng-disabled='submitStory.$invalid || !submitStory') Submit + button.btn.btn-big.btn-block.btn-primary#story-submit(type='submit') Submit script. $('#story-url').val(storyURL).attr('disabled', 'disabled'); $('#story-title').val(storyTitle);