Fix login and login info

diff --git a/public/index.html b/public/index.html
index fe78b539bb09fc8d2bbdde2890073a332cfb79e7..99003840880148485366797db593b34cfb603bcb 100755 (executable)
--- a/public/index.html
+++ b/public/index.html
@@ -26,22 +26,20 @@
                                                </a>
                                        </div>
                                        <div class="grid-9">
-<div id="login_status" style="display:none;">Currently logged in as <span class="username"></span></div>
                                                <nav id="user-nav" class="small">
                                                        <ul>
-                                                               <li>Hi, <span class="username"></span></li>
-                                                               <li><a href="#">Logout</a></li>
+                                                               <li>Hi, <span class="username">Guest</span></li>
+                                                               <li><a id=login_link href="/login">Login</a></li>
                                                        </ul>
                                                </nav>
                                                <nav id="main-nav" class="small">
                                                        <ul>
-                                                               <li><a href="/schools" class="active"><em class="icon"></em>Courses</a></li>
+                                                               <li id=course_link><a href="/schools" class="active"><em class="icon"></em>Courses</a></li>
                                                                <li><a href="http://blog.finalsclub.org"><em class="icon"></em>Blog</a></li>
-                                                               <li><a href="/archive"><em class="icon"></em>Library</a></li>
-                                                               <li><a href="/press"><em class="icon"></em>Press</a></li>
+                                                               <li id=archive_link><a href="/archive"><em class="icon"></em>Library</a></li>
+                                                               <li id=press_link><a href="/press"><em class="icon"></em>Press</a></li>
                                                                <li id=register_link><a href="/register"><em class="icon"></em>Register</a></li>
                                                                <li id=profile_link><a href="/profile"><em class="icon"></em>Profile</a></li>
-                                                               <li id=login_link><a href="/login"><em class="icon"></em>Profile</a></li>
                                                                <li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li>
                                                        </ul>
                                                </nav>

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index 819f813935e496d755ee522e00e2ee717a2745cf..a96cd7e6275827acbcf38e4704a95de097062d44 100644 (file)
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -52,7 +52,7 @@ function render(pageId, response) {
     $('#register_link').hide();
     $('#profile_link').show();
   } else {
-    $('.username').text('');
+    $('.username').text('Guest');
     $("#login_status").hide();
     $('#login_link').text('Login').attr('href', '/login');
     $('#register_link').show();