From e00b7cb252dc2515955d98848063e8f3882e449b Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Thu, 14 Jun 2012 16:46:07 -0400 Subject: [PATCH] askbot stuff. --- .../templates/course_navigation.jinja.html | 16 +++++++ .../mitx/templates/navigation.jinja.html | 46 +++++++++++++++++++ .../skins/mitx/templates/widgets/header.html | 40 +--------------- lms/envs/askbotsettings.py | 4 +- lms/templates/courseware-error.html | 2 +- 5 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 lms/askbot/skins/mitx/templates/course_navigation.jinja.html create mode 100644 lms/askbot/skins/mitx/templates/navigation.jinja.html diff --git a/lms/askbot/skins/mitx/templates/course_navigation.jinja.html b/lms/askbot/skins/mitx/templates/course_navigation.jinja.html new file mode 100644 index 0000000000..d39fd22166 --- /dev/null +++ b/lms/askbot/skins/mitx/templates/course_navigation.jinja.html @@ -0,0 +1,16 @@ +
+
+
    +
  1. Courseware
    2. +
  2. Course Info
    3. + {% if user.is_authenticated(): %} +
  3. Textbook
    4. +
  4. Discussion
    5. + {% endif%} +
  5. Wiki
    6. + {% if user.is_authenticated():%} +
  6. Profile
    7. + {% endif %} +
+
+
diff --git a/lms/askbot/skins/mitx/templates/navigation.jinja.html b/lms/askbot/skins/mitx/templates/navigation.jinja.html new file mode 100644 index 0000000000..d69afbebc6 --- /dev/null +++ b/lms/askbot/skins/mitx/templates/navigation.jinja.html @@ -0,0 +1,46 @@ +
+
+ + + + + {%if request.user.is_authenticated(): %} +

Circuits and Electronics

+
    +
  1. + + + {{ request.user.username }} + +
    2. +
  2. + ▾ +
      +
    1. Account Settings
      2. +
    2. Log Out
      3. +
    +
    3. +
+ {%else:%} +
    +
  1. Courses
    2. +
  2. How It Works
    3. +
+
    +
  1. Log In
    2. +
  2. Sign Up
    3. +
+
    +
  1. + About +
    2. +
  2. + Jobs +
    3. +
  3. + faq +
    4. +
+ {%endif %} +
+
diff --git a/lms/askbot/skins/mitx/templates/widgets/header.html b/lms/askbot/skins/mitx/templates/widgets/header.html index 0280abeb66..a922e7cb2b 100644 --- a/lms/askbot/skins/mitx/templates/widgets/header.html +++ b/lms/askbot/skins/mitx/templates/widgets/header.html @@ -1,40 +1,4 @@ {% import "macros.html" as macros %} -
-
-
-

MITx

-

Circuits and Electronics!!!!

-
- -
- -
    -
  • Courseware
    • -
  • Course Info
    • -
  • Textbook
    • -
  • Discussion
    • -
  • Wiki
    • -
  • Profile
    • -
-
-
-
- - +{% include "navigation.jinja.html" %} +{% include "course_navigation.jinja.html" %} diff --git a/lms/envs/askbotsettings.py b/lms/envs/askbotsettings.py index 681e65763d..57539a9ace 100644 --- a/lms/envs/askbotsettings.py +++ b/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 = { }, }, }, -} \ No newline at end of file +} diff --git a/lms/templates/courseware-error.html b/lms/templates/courseware-error.html index 0863ffe7e8..35865e58e1 100644 --- a/lms/templates/courseware-error.html +++ b/lms/templates/courseware-error.html @@ -2,7 +2,7 @@ <%block name="bodyclass">courseware <%block name="title">Courseware – MITx 6.002x -<%include file="navigation.html" args="active_page='courseware'" /> +<%include file="course_navigation.html" args="active_page='courseware'" />