askbot stuff.

lms/askbot/skins/mitx/templates/course_navigation.jinja.html

@@ -0,0 +1,16 @@
+<nav class="askbot course-material">
+  <div class="inner-wrapper">
+    <ol class="course-tabs">
+      <li class="courseware"><a href="{{ MITX_ROOT_URL }}/courseware">Courseware</a></li>
+      <li class="info"><a href="{{ MITX_ROOT_URL }}/info">Course Info</a></li>
+      {% if user.is_authenticated(): %}
+      <li class="book"><a href="{{ MITX_ROOT_URL }}/book">Textbook</a></li>
+      <li class="discussion"><a href="{{ MITX_ROOT_URL }}/discussion/questions/" class="active">Discussion</a></li>
+      {% endif%}
+      <li class="wiki"><a href="{{ MITX_ROOT_URL }}/wiki/view/">Wiki</a></li>
+      {% if user.is_authenticated():%}
+      <li class="profile"><a href="{{ MITX_ROOT_URL }}/profile">Profile</a></li>
+      {% endif %}
+    </ol>
+  </div>
+</nav>

lms/askbot/skins/mitx/templates/navigation.jinja.html

@@ -0,0 +1,46 @@
+<header class="app" aria-label="Global Navigation">
+  <nav>
+    <a href="{{ MITX_ROOT_URL }}" class="logo">
+      <img src="/static/images/logo.png" />
+    </a>
+
+    {%if request.user.is_authenticated(): %}
+    <h1>Circuits and Electronics</h1>
+    <ol class="user">
+      <li>
+        <a href="/dashboard" class="user-dashboard">
+          <span class="avatar"><img src="/static/images/profile.jpg" /></span>
+          {{ request.user.username }}
+        </a>
+      </li>
+      <li>
+        <a href="#" class="options">&#9662</a>
+        <ol class="user-options">
+          <li><a href="#">Account Settings</a></li>
+          <li><a href="/logout">Log Out</a></li>
+        </ol>
+      </li>
+    </ol>
+    {%else:%}
+    <ol>
+      <li><a href="/courses">Courses</a></li>
+      <li><a href="#">How It Works</a></li>
+    </ol>
+    <ol class="user">
+      <li><a href="/dashboard">Log In</a></li>
+      <li><a href="#">Sign Up</a></li>
+    </ol>
+    <ol class="secondary">
+      <li>
+        <a href="#">About</a>
+      </li>
+      <li>
+        <a href="#">Jobs</a>
+      </li>
+      <li>
+        <a href="#">faq</a>
+      </li>
+    </ol>
+    {%endif %}
+  </nav>
+</header>

lms/askbot/skins/mitx/templates/widgets/header.html

@@ -1,40 +1,4 @@
 <!-- template header.html -->
 {% import "macros.html" as macros %}
-<div class="header-wrapper">
-  <header>
-    <hgroup>
-      <h1><em>MITx</em></h1>
-      <h2><a href="/courseware">Circuits and Electronics!!!!</a></h2>
-    </hgroup>
-
-    <nav class="discussion">
-
-      <ul class="coursenav">
-        <li class="courseware"><a href="/courseware">Courseware</a></li>
-        <li class="info"><a href="/info">Course Info</a></li>
-        <li class="book"><a href="/book">Textbook</a></li>
-        <li class="discussion"><a href="/discussion">Discussion</a></li>
-        <li class="wiki"><a href="/wiki">Wiki</a></li>
-        <li class="profile"><a href="/profile">Profile</a></li>
-      </ul>
-    </nav>
-  </header>
-</div>
-<!--<div 
-    id="header"
-    class="{% if settings.SHOW_LOGO %}with-logo{% else %}without-logo{% endif %}"
->
-    <div class="content-wrapper">
-        <div id="userToolsNav">
-            {% include "widgets/user_navigation.html" %}
-        </div>
-        {% if settings.SHOW_LOGO %}
-            {% include "widgets/logo.html" %}
-        {% endif %}
-        <div id="metaNav">
-            {% include "widgets/meta_nav.html" %}
-        </div>
-        <div class="clean"></div>
-    </div>
-  </div>-->
-<!-- end template header.html -->
+{% include "navigation.jinja.html" %}
+{% include "course_navigation.jinja.html" %}

lms/envs/askbotsettings.py

@@ -133,7 +133,7 @@ LIVESETTINGS_OPTIONS = {
                 'SHOW_LOGO' : False,
                 'LOCAL_LOGIN_ICON' : u'/images/pw-login.gif',
                 'ALWAYS_SHOW_ALL_UI_FUNCTIONS' : False,
-                'ASKBOT_DEFAULT_SKIN' : u'default',
+                'ASKBOT_DEFAULT_SKIN' : u'mitx',
                 'USE_CUSTOM_HTML_HEAD' : False,
                 'FOOTER_MODE' : u'default',
                 'USE_CUSTOM_CSS' : False,
@@ -290,4 +290,4 @@ LIVESETTINGS_OPTIONS = {
             },
         },
     },
-}
+}

lms/templates/courseware-error.html

@@ -2,7 +2,7 @@
 <%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
-<%include file="navigation.html" args="active_page='courseware'" />
+<%include file="course_navigation.html" args="active_page='courseware'" />
 
 <section class="main-content">
   <section class="outside-app">