Menu work.

8d66f5ee · Matthew Mongeau · e048b325 · 8d66f5ee · 8d66f5ee · 8d66f5ee
Commit 8d66f5ee authored 12 years ago by Matthew Mongeau
Hide whitespace changes
Inline Side-by-side

Showing with 51 additions and 34 deletions

lms/templates/course_navigation.html
+25 -0

lms/templates/index.html
+0 -1

lms/templates/main.html
+2 -0

lms/templates/navigation.html
+24 -33

No files found.
--- a/lms/templates/course_navigation.html
+++ b/lms/templates/course_navigation.html
+<%page args="active_page" />
+
+<%
+def url_class(url):
+  if url == active_page:
+    return "active"
+  return ""
+%>
+
+<nav class="${active_page} course-material">
+  <div class="inner-wrapper">
+    <ol class="course-tabs">
+      <li class="courseware"><a href="${ MITX_ROOT_URL }/courseware/" class="${url_class('courseware')}">Courseware</a></li>
+      <li class="info"><a href="${ MITX_ROOT_URL }/info" class="${url_class('info')}">Course Info</a></li>
+% if user.is_authenticated():
+      <li class="book"><a href="${ MITX_ROOT_URL }/book" class="${url_class('book')}">Textbook</a></li>
+      <li class="discussion"><a href="${ MITX_ROOT_URL }/discussion/questions/">Discussion</a></li>
+% endif
+      <li class="wiki"><a href="${ MITX_ROOT_URL }/wiki/view/" class="${url_class('wiki')}">Wiki</a></li>
+% if user.is_authenticated():
+      <li class="profile"><a href="${ MITX_ROOT_URL }/profile" class="${url_class('profile')}">Profile</a></li>
+% endif
+    </ol>
+  </div>
+</nav>
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
 <%inherit file="main.html" />
-<%include file="guest_navigation.html" args="active_page='info'" />

 <section class="container">
  <section class="home">

--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -56,6 +56,7 @@
 </head>

 <body class="<%block name='bodyclass'/>">
+  <%include file="navigation.html" />
  <!--[if lte IE 9]>
  <p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
  <![endif]-->
@@ -63,6 +64,7 @@
  ${self.body()}
  <%block name="bodyextra"/>
  <%block name="js_extra"/>
+  <script src="${static.url('js/my_courses_dropdown.js')}"></script>

 </body>
 </html>
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
-<%page args="active_page" />
-
 <%namespace name='static' file='static_content.html'/>
-<%block name="js_extra">
-  <script src="${static.url('js/my_courses_dropdown.js')}"></script>
-</%block>
 <header class="app" aria-label="Global Navigation">
  <nav>
-    <a href="${ MITX_ROOT_URL }/mitxhome" class="logo">
-      <img src="${ MITX_ROOT_URL}/static/images/logo.png" />
+    <a href="${ MITX_ROOT_URL }" class="logo">
+      <img src="${static.url('images/logo.png')}" />
    </a>

-    <h1>${ settings.COURSE_TITLE }</h1>
    %if user.is_authenticated():
+    <h1>${ settings.COURSE_TITLE }</h1>
    <ol class="user">
      <li>
        <a href="/dashboard" class="user-dashboard">
@@ -23,34 +18,30 @@
        <a href="#" class="options">&#9662</a>
        <ol class="user-options">
          <li><a href="#">Account Settings</a></li>
-          <li><a href="/">Log Out</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>
-
-<%
-def url_class(url):
-  if url == active_page:
-    return "active"
-  return ""
-%>
-
-<nav class="${active_page} course-material">
-  <div class="inner-wrapper">
-    <ol class="course-tabs">
-      <li class="courseware"><a href="${ MITX_ROOT_URL }/courseware/" class="${url_class('courseware')}">Courseware</a></li>
-      <li class="info"><a href="${ MITX_ROOT_URL }/info" class="${url_class('info')}">Course Info</a></li>
-% if user.is_authenticated():
-      <li class="book"><a href="${ MITX_ROOT_URL }/book" class="${url_class('book')}">Textbook</a></li>
-      <li class="discussion"><a href="${ MITX_ROOT_URL }/discussion/questions/">Discussion</a></li>
-% endif
-      <li class="wiki"><a href="${ MITX_ROOT_URL }/wiki/view/" class="${url_class('wiki')}">Wiki</a></li>
-% if user.is_authenticated():
-      <li class="profile"><a href="${ MITX_ROOT_URL }/profile" class="${url_class('profile')}">Profile</a></li>
-% endif
-    </ol>
-  </div>
-</nav>