Merge pull request #907 from MITx/feature/rocha/ut-press-release

UT press release and related updates

lms/djangoapps/courseware/views.py

@@ -356,7 +356,7 @@ def static_tab(request, course_id, tab_slug):
     tab = tabs.get_static_tab_by_slug(course, tab_slug)
     if tab is None:
         raise Http404
-    
+
     contents = tabs.get_static_tab_contents(course, tab)
     if contents is None:
         raise Http404
@@ -415,6 +415,16 @@ def course_about(request, course_id):
 
 @ensure_csrf_cookie
 @cache_if_anonymous
+def static_university_profile(request, org_id):
+    """
+    Return the profile for the particular org_id that does not have any courses.
+    """
+    template_file = "university_profile/{0}.html".format(org_id).lower()
+    context = dict(courses=[], org_id=org_id)
+    return render_to_response(template_file, context)
+
+@ensure_csrf_cookie
+@cache_if_anonymous
 def university_profile(request, org_id):
     """
     Return the profile for the particular org_id.  404 if it's not valid.
@@ -485,7 +495,7 @@ def progress(request, course_id, student_id=None):
     courseware_summary = grades.progress_summary(student, request, course,
                                                  student_module_cache)
     grade_summary = grades.grade(student, request, course, student_module_cache)
-    
+
     if courseware_summary is None:
         #This means the student didn't have access to the course (which the instructor requested)
         raise Http404
@@ -498,4 +508,3 @@ def progress(request, course_id, student_id=None):
     context.update()
 
     return render_to_response('courseware/progress.html', context)
-

lms/templates/feed.rss

@@ -6,16 +6,25 @@
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
   ##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2012-07-16T14:08:12-07:00</updated>
+  <updated>2012-10-14T14:08:12-07:00</updated>
   <entry>
-    <id>tag:www.edx.org,2012:Post/5</id>
-    <published>2012-09-25T14:00:00-07:00</published>
-    <updated>2012-09-25T14:00:00-07:00</updated>
-    <link type="text/html" rel="alternate" href="${reverse('press/elsevier-collaborates-with-edx')}"/>
-    <title>Elsevier collaborates with edX</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/foundations-of-analog-109x84.jpg')}&quot; /&gt;
-      &lt;p&gt;Free course textbook made available to edX students&lt;/p&gt;</content>
+    <id>tag:www.edx.org,2012:Post/6</id>
+    <published>2012-10-15T14:00:00-07:00</published>
+    <updated>2012-10-14T14:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/ut-joins-edx')}"/>
+    <title>The University of Texas System joins edX</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/uts-seal_109x84.jpg')}&quot; /&gt;
+         &lt;p&gt;nine universities and six health institutions&lt;/p&gt;</content>
   </entry>
+  <!-- <entry> -->
+  <!--   <id>tag:www.edx.org,2012:Post/5</id> -->
+  <!--   <published>2012-09-25T14:00:00-07:00</published> -->
+  <!--   <updated>2012-09-25T14:00:00-07:00</updated> -->
+  <!--   <link type="text/html" rel="alternate" href="${reverse('press/elsevier-collaborates-with-edx')}"/> -->
+  <!--   <title>Elsevier collaborates with edX</title> -->
+  <!--   <content type="html">&lt;img src=&quot;${static.url('images/press/foundations-of-analog-109x84.jpg')}&quot; /&gt; -->
+  <!--     &lt;p&gt;Free course textbook made available to edX students&lt;/p&gt;</content> -->
+  <!-- </entry> -->
   <entry>
     <id>tag:www.edx.org,2012:Post/4</id>
     <published>2012-09-06T14:00:00-07:00</published>

lms/templates/index.html

@@ -65,6 +65,14 @@
               </div>
             </a>
           </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['UTx'])}">
+              <img src="${static.url('images/university/ut/ut-rollover_160x90.png')}" />
+              <div class="name">
+                <span>UTx</span>
+              </div>
+            </a>
+          </li>
           <li class="partner last">
             <a href="${reverse('university_profile', args=['BerkeleyX'])}">
               <img src="${static.url('images/university/berkeley/berkeley.png')}" />

lms/templates/university_profile/utx.html

+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>UTx</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/ut/ut-cover_2025x550.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/ut/ut-standalone_187x80.png')}" />
+        </div>
+        <h1>UTx</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>Educating students, providing care for patients, conducting groundbreaking research and serving the needs of Texans and the nation for more than 130 years, The University of Texas System is one of the largest public university systems in the United States, with nine academic universities and six health science centers. Student enrollment exceeded 215,000 in the 2011 academic year. The UT System confers more than one-third of the state’s undergraduate degrees and educates nearly three-fourths of the state’s health care professionals annually. The UT System has an annual operating budget of $13.1 billion (FY 2012) including $2.3 billion in sponsored programs funded by federal, state, local and private sources. With roughly 87,000 employees, the UT System is one of the largest employers in the state.</p>
+</%block>
+
+${parent.body()}

lms/urls.py

@@ -52,6 +52,7 @@ urlpatterns = ('',
 
     url(r'^heartbeat$', include('heartbeat.urls')),
 
+    url(r'^university_profile/UTx$', 'courseware.views.static_university_profile', name="static_university_profile", kwargs={'org_id':'UTx'}),
     url(r'^university_profile/(?P<org_id>[^/]+)$', 'courseware.views.university_profile', name="university_profile"),
 
     #Semi-static views (these need to be rendered and have the login bar, but don't change)
@@ -88,6 +89,8 @@ urlpatterns = ('',
         {'template': 'press_releases/edX_announces_proctored_exam_testing.html'}, name="press/edX-announces-proctored-exam-testing"),
     url(r'^press/elsevier-collaborates-with-edx$', 'static_template_view.views.render',
         {'template': 'press_releases/Elsevier_collaborates_with_edX.html'}, name="press/elsevier-collaborates-with-edx"),
+    url(r'^press/ut-joins-edx$', 'static_template_view.views.render',
+        {'template': 'press_releases/UT_joins_edX.html'}, name="press/ut-joins-edx"),
 
 
     # Should this always update to point to the latest press release?