More template cleanup. Moved openid template to extauth/.

common/djangoapps/external_auth/views.py

@@ -47,7 +47,7 @@ log = logging.getLogger("mitx.external_auth")
 def default_render_failure(request,
                            message,
                            status=403,
-                           template_name='extauth_failure.html',
+                           template_name='extauth/extauth_failure.html',
                            exception=None):
     """Render an Openid error page to the user"""
 
@@ -518,7 +518,7 @@ def provider_login(request):
         return_to = matches.group(1)
 
     # display login page
-    response = render_to_response('provider_login.html', {
+    response = render_to_response('extauth/provider_login.html', {
         'error': error,
         'return_to': return_to
     })
@@ -533,7 +533,7 @@ def provider_identity(request):
     XRDS for identity discovery
     """
 
-    response = render_to_response('identity.xml',
+    response = render_to_response('extauth/identity.xml',
                                   {'url': get_xrds_url('login', request)},
                                   mimetype='text/xml')
 

lms/djangoapps/courseware/views.py

@@ -459,7 +459,7 @@ def news(request, course_id):
         'content': render_notifications(request, course, notifications),
     }
 
-    return render_to_response('news.html', context)
+    return render_to_response('courseware/news.html', context)
 
 @login_required
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)

lms/djangoapps/instructor/views.py

@@ -361,7 +361,7 @@ def enroll_students(request, course_id):
         except:
             rejected_students.append(student)
 
-    return render_to_response("enroll_students.html", {'course': course_id,
+    return render_to_response("courseware/enroll_students.html", {'course': course_id,
                                                        'existing_students': existing_students,
                                                        'added_students': added_students,
                                                        'rejected_students': rejected_students,

lms/envs/devplus.py

@@ -57,7 +57,7 @@ DEBUG_TOOLBAR_PANELS = (
    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
    'debug_toolbar.panels.headers.HeaderDebugPanel',
    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-   'debug_toolbar.panels.sql.SQLDebugPanel',
+   #'debug_toolbar.panels.sql.SQLDebugPanel',
    'debug_toolbar.panels.signals.SignalDebugPanel',
    'debug_toolbar.panels.logger.LoggingPanel',
 
@@ -68,4 +68,11 @@ DEBUG_TOOLBAR_PANELS = (
   'debug_toolbar.panels.profiling.ProfilingDebugPanel',
 )
 
-#PIPELINE = True
+DEBUG_TOOLBAR_CONFIG = {
+    'INTERCEPT_REDIRECTS': False,
+}
+
+# PIPELINE = True
+MITX_FEATURES['DISABLE_START_DATES'] = True
+
+#GENERATE_PROFILE_SCORES = True

lms/templates/news.html → lms/templates/courseware/news.html

-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
+<%inherit file="/main.html" />
+<%namespace name='static' file='/static_content.html'/>
 <%block name="bodyclass">courseware news</%block>
 <%block name="title"><title>News – MITx 6.002x</title></%block>
 

lms/templates/frame/navigation.html

@@ -92,7 +92,7 @@ site_status_msg = get_site_status_msg(course_id)
 % endif
 
 %if not user.is_authenticated():
-  <%include file="login_modal.html" />
-  <%include file="signup_modal.html" />
-  <%include file="forgot_password_modal.html" />
+  <%include file="/frame/login_modal.html" />
+  <%include file="/frame/signup_modal.html" />
+  <%include file="/frame/forgot_password_modal.html" />
 %endif

lms/templates/using.html

-<h1>Using the system</h1>
-
-<ul>
-  <li>
-    <p>During video playback, use the subtitles and the scroll bar to navigate. Clicking the subtitles is a fast way to skip forwards and backwards by small amounts.</p>
-  </li>
-
-  <li>
-    <p>If you are on a low-resolution display, the left navigation bar can be hidden by clicking on the set of three left arrows next to it.</p>
-  </li>
-
-  <li>
-    <p>If you need bigger or smaller fonts, use your browsers settings to scale them up or down. Under Google Chrome, this is done by pressing ctrl-plus, or ctrl-minus at the same time.</p>
-  </li>
-</ul>