Skip to content

E
edx-platform
Commit aeb45542 by Bridger Maxwell
Options

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.
parent 153129c1
Showing with 13 additions and 13 deletions
cms/templates/base.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<!doctype html> <!doctype html>
<html> <html>
......
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.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/jquery-ui.min.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/jquery-ui.min.js')}"></script>
......
common/templates/problem.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<h2 class="problem-header"> <h2 class="problem-header">
${ problem['name'] } ${ problem['name'] }
% if problem['weight'] != 1 and problem['weight'] != None: % if problem['weight'] != 1 and problem['weight'] != None:
......
doc/overview.md
...@@ -120,7 +120,7 @@ We use a fork of django-pipeline to make sure that the js and css always reflect ...@@ -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 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 ### Other modules
......
lms/templates/dogfood/dogfood.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
......
lms/templates/dogfood/quickedit.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
......
lms/templates/extauth/provider_login.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="headextra"> <%block name="headextra">
<style type="text/css"> <style type="text/css">
......
lms/templates/main.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
......
lms/templates/name_changes.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<script> <script>
function name_confirm(id) { function name_confirm(id) {
postJSON('/accept_name_change',{"id":id}, postJSON('/accept_name_change',{"id":id},
......
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 from courseware.courses import course_image_url, get_course_about_section
%> %>
......
lms/templates/portal/feed.rss
<?xml version="1.0" encoding="UTF-8"?> <?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/"> <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> <id>tag:www.edx.org,2012:/blog</id>
<link type="text/html" rel="alternate" href="http://blog.edx.org/"/> <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
......
lms/templates/portal/video_modal.html
<%! <%!
from courseware.courses import get_course_about_section 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"> <section id="video-modal" class="modal video-modal">
<div class="inner-wrapper"> <div class="inner-wrapper">
......
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