More cleanup of templates folder. Moved some xmodule templates to common.

common/djangoapps/student/views.py

@@ -147,7 +147,7 @@ def dashboard(request):
                'errored_courses': errored_courses,
                'show_courseware_links_for' : show_courseware_links_for}
 
-    return render_to_response('dashboard.html', context)
+    return render_to_response('portal/dashboard.html', context)
 
 
 def try_change_enrollment(request):

lms/djangoapps/courseware/views.py

@@ -95,7 +95,7 @@ def render_accordion(request, course, chapter, section):
     context = dict([('toc', toc),
                     ('course_id', course.id),
                     ('csrf', csrf(request)['csrf_token'])] + template_imports.items())
-    return render_to_string('accordion.html', context)
+    return render_to_string('courseware/accordion.html', context)
 
 
 def get_current_child(xmodule):

lms/templates/contact.html

-<%namespace name='static' file='static_content.html'/>
-
-<%inherit file="main.html" />
-
-<section class="container about">
-  <nav>
-    <a href="/t/about.html">Vision</a>
-    <a href="/t/faq.html">Faq</a>
-    <a href="/t/press.html">Press</a>
-    <a href="/t/contact.html" class="active">Contact</a>
-  </nav>
-
-  <section class="contact">
-    <div class="photo">
-      <img src="${static.url('images/contact-page.jpg')}">
-    </div>
-    <div class="contacts">
-      <h2>Class Feedback</h2>
-      <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that&nbsp;class.</p>
-
-      <h2>General Inquiries and Feedback</h2>
-      <p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
-
-      <h2>Technical Inquiries and Feedback</h2>
-      <p>If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:technical@edx.org">technical@edx.org</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p>
-
-      <h2>Media</h2>
-      <p>Please visit our <a href="${reverse('faq_edx')}">media/press page</a> for more information. 
For any media or press inquiries, please email <a href="mailto:press@edx.org">press@edx.org</a>.</p>
-
-      <h2>Universities</h2>
-      <p>If you are a university wishing to Collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
-
-    </div>
-  </section>
-</section>
-

lms/templates/accordion.html → lms/templates/courseware/accordion.html

+## mako
 <%! from django.core.urlresolvers import reverse %>
 
 <%def name="make_chapter(chapter)">

lms/templates/dashboard.html → lms/templates/portal/dashboard.html

+## mako
 <%!
   from django.core.urlresolvers import reverse
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
 %>
-<%inherit file="main.html" />
+<%inherit file="../main.html" />
 
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='../static_content.html'/>
 
 <%block name="title"><title>Dashboard</title></%block>