fixes dependency; fixes footer and navigation bar

lms/templates/footer.html

@@ -35,42 +35,23 @@
           </li>
       </ol>
       </nav>
-
-      <div class="colophon-about">
-        <img src="${MITX_ROOT_URL}/static/images/header-logo.png" />
-
-        <p>${_("{platform_name} is a non-profit created by founding partners {Harvard} and {MIT} whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. {platform_name}'s free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.").format(platform_name="EdX", Harvard="Harvard", MIT="MIT")}</p>
-      </div>
     </div>
 
     <div class="references">
       <nav class="nav-social">
         <ul>
-          <li class="nav-social-01">
-            <a href="http://www.meetup.com/edX-Global-Community/" rel="external">
-              <img src="${MITX_ROOT_URL}/static/images/social/ico-social-meetup.png" alt="edX on Meetup" />
-            </a>
-          </li>
-          <li class="nav-social-02">
-            <a href="http://www.facebook.com/EdxOnline" rel="external">
-              <img src="${MITX_ROOT_URL}/static/images/social/ico-social-facebook.png" alt="edX on Facebook" />
-            </a>
-          </li>
-          <li class="nav-social-03">
-            <a href="https://twitter.com/edXOnline" rel="external">
-              <img src="${MITX_ROOT_URL}/static/images/social/ico-social-twitter.png" alt="edX on Twitter" />
-            </a>
-          </li>
-          <li class="nav-social-04">
-            <a href="https://plus.google.com/108235383044095082735/posts" rel="external">
-              <img src="${MITX_ROOT_URL}/static/images/social/ico-social-google.png" alt="edX on Google+" />
-            </a>
-          </li>
-          <li class="nav-social-05">
-            <a href="http://youtube.com/user/edxonline" rel="external">
-              <img src="${MITX_ROOT_URL}/static/images/social/ico-social-youtube.png" alt="edX on YouTube" />
-            </a>
-          </li>
+<li class="nav-legal-01">
+      <a href="http://olimpiada.ru/">Olimpiada.ru</a>
+      </li>
+      <li class="nav-legal-02">
+      <a href="http://fizteh2013.ru/">Олимпиада Физтех-2013</a>
+      </li>
+      <li class="nav-legal-03">
+      <a href="http://lomonosov.msu.ru/">Олимпиада школьников ломоносов</a>
+      </li>
+      <li class="nav-legal-04">
+      <a href="http://info.olimpiada.ru/calendar">Календарь олимпиад</a>
+</li>
         </ul>
       </nav>
 
@@ -78,9 +59,6 @@
 
       <nav class="nav-legal">
         <ul>
-          <li class="nav-legal-01">
-            <a href="${marketing_link('TOS')}">${_("Terms of Service and Honor Code")}</a>
-          </li>
           <li class="nav-legal-02">
             <a href="${marketing_link('PRIVACY')}">${_("Privacy Policy")}</a>
           </li>

lms/templates/navigation.html

@@ -47,6 +47,17 @@ site_status_msg = get_site_status_msg(course_id)
         <img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}" alt="${_('{settings.PLATFORM_NAME} home')}" />
       </%block>
     </a>
+    <span style="
+    display: inline-block;
+    /* margin-top: 20px; */
+    margin-left: 130px;
+    /* float: left; */
+    font-size: initial;
+    /* font-weight: 800; */
+    white-space: nowrap;
+">Департамент образования города Москвы<br>
+центр педагогического мастерства<br>
+курсы повышения квалификации учителей</span>
   </h1>
 
     % if course:

lms/templates/university_profile/edge.html

@@ -35,17 +35,18 @@ html, body {
 }
 .wrapper {
   min-height: 100%;
-  margin-bottom: -100px;
+  margin-bottom: -85px;
 }
 .wrapper:after {
   content: "";
   display: block;
 }
 .footer-short, .wrapper:after {
-  height:100px;
+  height:85px;
 }
 .footer-short {
   border-top: 1px solid #c4c5c7;
+  padding: 0;
 }
 
 footer .colophon .nav-colophon li a {
@@ -65,10 +66,7 @@ footer a:hover {
 }
 
 footer .references .copyright {
-margin: -2px 0 8px 0;
-font-size: 0.6875em;
-color: #c4c5c7;
-text-align: right;
+margin: 0;
 }
 
 footer .colophon {
@@ -139,9 +137,9 @@ float: right;
   </div>
 </div>
 </div>
-<div class="wrapper footer-wrapper fpoter-short">
-<footer class="footer-short">
-<div class="colophon">
+<div class="wrapper-footer footer-short">
+<footer>
+<div class="colophon" style="padding-top: 10px;">
   <nav class="nav-colophon">
       <ol>
           <li class="nav-colophon-01">
@@ -153,7 +151,7 @@ float: right;
           <a id="faq" href="/help">
               FAQ, ЧаВо
           </a>
-          </li>-->
+          </li>
           <li class="nav-colophon-05">
           <a id="contact" href="/contact">
               Контакты
@@ -162,9 +160,9 @@ float: right;
       </ol>
   </nav>
 </div>
-  <div class="references">
+  <div class="references" style="margin: 10px 0 0 0;">
       
-      <span>Полезные ссылки</span>
+      <span style="text-align: right;display: block;">Полезные ссылки</span>
       <nav class="nav-legal">
         <ul>
           <li class="nav-legal-01">

requirements/edx/base.txt

@@ -91,3 +91,4 @@ nose-ignore-docstring
 nose-exclude
 
 git+https://github.com/mfogel/django-settings-context-processor.git
+git+https://github.com/brosner/django-announcements.git