Skip to content

E
edx-platform
Commit 6df10518 by Bridger Maxwell
Options

More template cleanup. Moved navigation, footer, etc to templates/frame.

parent 27c431a6
Showing with 10 additions and 10 deletions
common/djangoapps/student/views.py
...@@ -635,7 +635,7 @@ def confirm_email_change(request, key): ...@@ -635,7 +635,7 @@ def confirm_email_change(request, key):
try: try:
pec = PendingEmailChange.objects.get(activation_key=key) pec = PendingEmailChange.objects.get(activation_key=key)
except PendingEmailChange.DoesNotExist: except PendingEmailChange.DoesNotExist:
return render_to_response("invalid_email_key.html", {}) return render_to_response("portal/invalid_email_key.html", {})
user = pec.user user = pec.user
d = {'old_email': user.email, d = {'old_email': user.email,
......
lms/templates/footer.html → lms/templates/frame/footer.html
## mako ## mako
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<footer> <footer>
<nav> <nav>
......
lms/templates/login_modal.html → lms/templates/frame/login_modal.html
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<section id="login-modal" class="modal login-modal"> <section id="login-modal" class="modal login-modal">
<div class="inner-wrapper"> <div class="inner-wrapper">
......
lms/templates/navigation.html → lms/templates/frame/navigation.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## TODO: Split this into two files, one for people who are authenticated, and ## TODO: Split this into two files, one for people who are authenticated, and
## one for people who aren't. Assume a Course object is passed to the former, ## one for people who aren't. Assume a Course object is passed to the former,
## instead of using settings.COURSE_TITLE ## instead of using settings.COURSE_TITLE
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
......
lms/templates/signup_modal.html → lms/templates/frame/signup_modal.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%! from django_countries.countries import COUNTRIES %> <%! from django_countries.countries import COUNTRIES %>
<%! from student.models import UserProfile %> <%! from student.models import UserProfile %>
......
lms/templates/main.html
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
<body class="<%block name='bodyclass'/>"> <body class="<%block name='bodyclass'/>">
<%include file="navigation.html" /> <%include file="frame/navigation.html" />
<section class="content-wrapper"> <section class="content-wrapper">
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
</section> </section>
<%include file="footer.html" /> <%include file="frame/footer.html" />
<%static:js group='application'/> <%static:js group='application'/>
<%static:js group='module-js'/> <%static:js group='module-js'/>
......
lms/templates/main_django.html
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
</head> </head>
<body class="{% block bodyclass %}{% endblock %}"> <body class="{% block bodyclass %}{% endblock %}">
{% include "navigation.html" %} {% include "frame/navigation.html" %}
<section class="content-wrapper"> <section class="content-wrapper">
{% block body %}{% endblock %} {% block body %}{% endblock %}
{% block bodyextra %}{% endblock %} {% block bodyextra %}{% endblock %}
</section> </section>
{% include "footer.html" %} {% include "frame/footer.html" %}
{% compressed_js 'application' %} {% compressed_js 'application' %}
{% compressed_js 'module-js' %} {% compressed_js 'module-js' %}
......
lms/templates/portal/course_about.html
...@@ -190,4 +190,4 @@ ...@@ -190,4 +190,4 @@
%endif %endif
<%include file="../video_modal.html" /> <%include file="portal/video_modal.html" />
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment