Fixed references to main.html and static_content.html in templates to be…

Fixed references to main.html and static_content.html in templates to be absolute instead of relative.

Fixed references to main.html and static_content.html in templates to be…
Fixed references to main.html and static_content.html in templates to be absolute instead of relative.
aeb45542 · Bridger Maxwell · 153129c1 · aeb45542 · aeb45542 · aeb45542
Commit aeb45542 authored Oct 25, 2012 by Bridger Maxwell
12 changed files
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>

 <!doctype html>
 <html>

--- a/common/templates/courseware_vendor_js.html
+++ b/common/templates/courseware_vendor_js.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>

 <script type="text/javascript" src="${static.url('js/vendor/jquery.min.js')}"></script>
 <script type="text/javascript" src="${static.url('js/vendor/jquery-ui.min.js')}"></script>

--- a/common/templates/problem.html
+++ b/common/templates/problem.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 <h2 class="problem-header">
  ${ problem['name'] }
  % if problem['weight'] != 1 and problem['weight'] != None:

--- a/doc/overview.md
+++ b/doc/overview.md
@@ -120,7 +120,7 @@ We use a fork of django-pipeline to make sure that the js and css always reflect

 In production, the django `collectstatic` command recompiles everything and puts all the generated static files in a static/ dir.  A starting point in the code is `django-pipeline/pipeline/packager.py:pack`.

-In development, we don't use collectstatic, instead accessing the files in place.  The auto-compilation is run via `common/djangoapps/pipeline_mako/templates/static_content.html`.  Details: templates include `<%namespace name='static' file='static_content.html'/>`, then something like `<%static:css group='application'/>` to call the functions in `common/djangoapps/pipeline_mako/__init__.py`, which call the `django-pipeline` compilers.
+In development, we don't use collectstatic, instead accessing the files in place.  The auto-compilation is run via `common/djangoapps/pipeline_mako/templates/static_content.html`.  Details: templates include `<%namespace name='static' file='/static_content.html'/>`, then something like `<%static:css group='application'/>` to call the functions in `common/djangoapps/pipeline_mako/__init__.py`, which call the `django-pipeline` compilers.

 ### Other modules


--- a/lms/templates/dogfood/dogfood.html
+++ b/lms/templates/dogfood/dogfood.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 <!DOCTYPE html>
 <html>
 ## -----------------------------------------------------------------------------

--- a/lms/templates/dogfood/quickedit.html
+++ b/lms/templates/dogfood/quickedit.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 <!DOCTYPE html>
 <html>
 ## -----------------------------------------------------------------------------

--- a/lms/templates/extauth/provider_login.html
+++ b/lms/templates/extauth/provider_login.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="headextra">
 <style type="text/css">

--- a/lms/templates/main.html
+++ b/lms/templates/main.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 <!DOCTYPE html>
 <html>
 <head>

--- a/lms/templates/name_changes.html
+++ b/lms/templates/name_changes.html
-<%inherit file="main.html" />
+<%inherit file="/main.html" />
 <script>
 function name_confirm(id) {
  postJSON('/accept_name_change',{"id":id},

--- a/lms/templates/portal/course.html
+++ b/lms/templates/portal/course.html
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 <%!
    from courseware.courses import course_image_url, get_course_about_section
 %>

--- a/lms/templates/portal/feed.rss
+++ b/lms/templates/portal/feed.rss
 <?xml version="1.0" encoding="UTF-8"?>
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
  <id>tag:www.edx.org,2012:/blog</id>
  <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>

--- a/lms/templates/portal/video_modal.html
+++ b/lms/templates/portal/video_modal.html
 <%! 
  from courseware.courses import get_course_about_section
 %>
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>

 <section id="video-modal" class="modal video-modal">
  <div class="inner-wrapper">