Merge pull request #8663 from edx/christina/move-forgot-password-modal

Move forgot_password_modal to login.html.

lms/templates/login.html

@@ -130,6 +130,8 @@ from microsite_configuration import microsite
   </script>
 </%block>
 
+<%include file="forgot_password_modal.html" />
+
 <section class="introduction">
   <header>
     <h1 class="title">
@@ -239,4 +241,3 @@ from microsite_configuration import microsite
 
   </aside>
   </section>
-

lms/templates/navigation-edx.html

@@ -150,8 +150,4 @@ site_status_msg = get_site_status_msg(course_id)
 <![endif]-->
 % endif
 
-%if not user.is_authenticated():
-  <%include file="forgot_password_modal.html" />
-%endif
-
 <%include file="help_modal.html"/>

lms/templates/navigation.html

@@ -156,8 +156,4 @@ site_status_msg = get_site_status_msg(course_id)
 <![endif]-->
 % endif
 
-%if not user.is_authenticated():
-  <%include file="forgot_password_modal.html" />
-%endif
-
 <%include file="help_modal.html"/>