Integrate Brian T's front-page changes, add epfl and delft

- removed duplicate logos.
- cover images are still in the 200-350 KB range.

lms/templates/university_profile/anux.html

@@ -8,7 +8,7 @@
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/university/anu/anu-logo.png')}" />
+           <img src="${static.url('images/university/anu/anu.png')}" />
         </div>
         <h1>ANUx</h1>
       </hgroup>

lms/templates/university_profile/delftx.html

+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>DelftX</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/delft/delft-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/delft/delft.png')}" />
+        </div>
+        <h1>DelftX</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>Delft University of Technology is the largest and oldest technological university in the Netherlands. Our research is inspired by the desire to increase fundamental understanding, as well as by societal challenges. We encourage our students to be independent thinkers so they will become engineers capable of solving complex problems. Our students have chosen Delft University of Technology because of our reputation for quality education and research.</p>
+</%block>
+
+${parent.body()}

lms/templates/university_profile/epflx.html

+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>EPFLx</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/epfl/epfl-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/epfl/epfl.png')}" />
+        </div>
+        <h1>EPFLx</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>EPFL is one of the two Swiss Federal Institutes of Technology. With the status of a national school since 1969, the young engineering school has grown in many dimensions, to the extent of becoming one of the most famous European institutions of science and technology. It has three core missions: training, research and technology transfer. </p>
+
+ <p>EPFL is located in Lausanne in Switzerland, on the shores of the largest lake in Europe, Lake Geneva and at the foot of the Alps and Mont-Blanc. Its main campus brings together over 11,000 persons, students, researchers and staff in the same magical place. Because of its dynamism and rich student community, EPFL has been able to create a special spirit imbued with curiosity and simplicity. Daily interactions amongst students, researchers and entrepreneurs on campus give rise to new scientific, technological and architectural projects.
+</p>
+</%block>
+
+${parent.body()}

lms/templates/university_profile/mcgillx.html

@@ -8,7 +8,7 @@
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/university/mcgill/mcgill-logo.png')}" />
+           <img src="${static.url('images/university/mcgill/mcgill.png')}" />
         </div>
         <h1>McGillX</h1>
       </hgroup>

lms/templates/university_profile/ricex.html

@@ -8,7 +8,7 @@
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/university/rice/rice-logo.png')}" />
+           <img src="${static.url('images/university/rice/rice.png')}" />
         </div>
         <h1>RiceX</h1>
       </hgroup>

lms/templates/university_profile/torontox.html

@@ -8,7 +8,7 @@
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/university/toronto/toronto-logo.png')}" />
+           <img src="${static.url('images/university/toronto/toronto.png')}" />
         </div>
         <h1>TorontoX</h1>
       </hgroup>

lms/urls.py

@@ -79,6 +79,10 @@ urlpatterns = ('',
         name="static_university_profile", kwargs={'org_id': 'RiceX'}),
     url(r'^university_profile/ANUx$', 'courseware.views.static_university_profile',
         name="static_university_profile", kwargs={'org_id': 'ANUx'}),
+    url(r'^university_profile/DelftX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'DelftX'}),
+    url(r'^university_profile/EPFLx$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'EPFLx'}),
 
     url(r'^university_profile/(?P<org_id>[^/]+)$', 'courseware.views.university_profile',
         name="university_profile"),