Merge branch 'select' of https://github.com/Man2Life/edx-platform into select

cms/templates/signup.html

@@ -6,18 +6,8 @@
 <%block name="title">${_("Sign Up")}</%block>
 <%block name="bodyclass">not-signedin signup</%block>
 
-<%block name="js_extra">
-  <script type="text/javascript" src="${static.url('js/jquery.masked.input.min.js')}"></script>
-</%block>
-
 <%block name="content">
 
-<script>
-jQuery(function($){
-   $("#contact-phone").mask("(999) 999-9999");
-});
-</script>
-
 <div class="wrapper-content wrapper">
   <section class="content">
     <header>

lms/templates/signup_modal.html

@@ -7,6 +7,12 @@
 <%! from datetime import date %>
 <%! import calendar %>
 
+<script>
+jQuery(function($){
+   $("#contact-phone").mask("(999) 999-9999");
+});
+</script>
+
 <section id="signup-modal" class="modal signup-modal">
   <div class="inner-wrapper">
     <div id="register" class="register">

lms/templates/university_profile/edge.html

@@ -36,7 +36,9 @@
 </%block>
 
 <%block name="js_extra">
+<script type="text/javascript" src="${static.url('js/jquery.masked.input.min.js')}"></script>
 <script type="text/javascript">
+
   (function() {
     $(document).ready(function() {
       if ($.deparam.fragment()['forgot-password-modal'] !== undefined) {