Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse

Browse Source
This commit is contained in:
John Jarvis
2012-07-10 18:11:36 -04:00
parent ec47b72caf 3dd923d9b9
commit 65e2de9058
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/common.py
View File

@@ -118,7 +118,7 @@ TEMPLATE_DEBUG = False
SITE_ID = 1
SITE_NAME = "localhost:8000"
HTTPS = 'on'
ROOT_URLCONF = 'mitx.cms.urls'
ROOT_URLCONF = 'cms.urls'
IGNORABLE_404_ENDS = ('favicon.ico')
# Email

2
lms/envs/common.py
View File

@@ -155,7 +155,7 @@ TEMPLATE_DEBUG = False
SITE_ID = 1
SITE_NAME = "localhost:8000"
HTTPS = 'on'
ROOT_URLCONF = 'mitx.lms.urls'
ROOT_URLCONF = 'lms.urls'
IGNORABLE_404_ENDS = ('favicon.ico')
# Email

8
lms/templates/about.html
View File

@@ -45,15 +45,15 @@
<section class="faq">
<nav class="categories">
<a href="#the-orginization">The orginization</a>
<a href="#the-organization">The organization</a>
<a href="#technology-platform">Technology Platform</a>
<a href="#learning-objectives">Learning Objectives</a>
<a href="#the-students">The Students</a>
</nav>
<section class="responses">
<section id="the-orginization" class="category">
<h2>The Orginization</h2>
<section id="the-organization" class="category">
<h2>The Organization</h2>
<article class="response">
<h3>What is edX?</h3>
@@ -162,7 +162,7 @@
<article class="response">
<h3>How do you intend to test whether this approach is improving learning?</h3>
<p>Both institutions have assembled faculty who will look at data collection and analytical tools for assessing the results.</p>
<p>Both institutions have assembled faculty who will look at data collection and analytical tools for assessing the results.</p>
</article>
</section>
</section>