Merge branch 'master' of github.com:finalsclubdev/FinalsClub

public/index.html

@@ -28,16 +28,16 @@
 					<div class="grid-9">
 						<nav id="user-nav" class="small">
 							<ul>
-								<li><span class="username"></span></li>
-								<li><a id=login_link href="/login"></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><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li -->

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();