Make logout work. Add back navbar style. Fix style of course & username indicators.

app/assets/javascripts/application.js

@@ -12,6 +12,7 @@
 //
 //= require underscore
 //= require jquery
+//= require jquery-ujs
 //= require MathJax
 //= require MathJax/config/TeX-AMS_HTML-full.js
 //= require pagedown-extra/pagedown/Markdown.Converter.js

app/assets/stylesheets/application.scss

@@ -23,9 +23,9 @@ $incorrect-answer: rgba(240,115,115, 0.8);
 $feedback-answer: rgba(140,140,250, 0.8);
 $quiz-question-separation: 5vh;
 
-
-@import "home";
-
 @import "base";
 
 @import "default";
+
+@import "home";
+

app/assets/stylesheets/home.scss

@@ -184,15 +184,20 @@ color:#BF2C37;
 
 }
 
+.navbar-nav > li > a {
+        padding-top:0px;        
+}
+
 .course-title {
     margin-top: $header_magin;
-    padding-left: 64px + 15px;
+    padding-left: 64px + 15px + 10px;
     height: 20px;
 }
 
 .logged-in-user {
     display:inline-block;
     float:right;
+    padding-right: 0px;
     height: 20px;
 }
 

app/controllers/sessions_controller.rb

@@ -24,6 +24,6 @@ class SessionsController < ApplicationController
   def destroy
     log_out
     CASClient::Frameworks::Rails::Filter.logout(self) if Rails.env.production?
-    redirect_to root_url if !Rails.env.production?
+    redirect_to '/login' if !Rails.env.production?
   end
 end

app/views/home/index.html.erb

@@ -19,7 +19,7 @@
             <div style="display:block;position:absolute;margin-left:80px;margin-top:10px;">Course Title</div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
-            <div class="course-title">Course Title <div class="logged-in-user">username</div> </div>
+            <div class="course-title"><%= @course %><div class="logged-in-user"> <%= current_user_id %></div> </div>
             <div class="collapse navbar-collapse " id="bs-example-navbar-collapse-1">
               <ul class="nav navbar-nav top-menu ">
                 <li class=" "><a href="http://enote.compute.dtu.dk:8888/1/index.html#">Agendas <span class="sr-only">(current)</span></a></li>
@@ -43,10 +43,9 @@
 
 
               <ul class="nav navbar-nav top-menu navbar-right login"> 
-                <li><a href="/login"><i class="fa fa-sign-in"></i> Login </a> </li>
+                <li> <%= link_to "Logout", logout_path, { :id => 'logout-button', :class => 'fa fa-sign-in', :method => :delete } %></li>
               </ul>
               
-              
             </div><!-- /.navbar-collapse -->
             
             

bower.json

@@ -22,6 +22,7 @@
   "dependencies": {
     "bootstrap": "3.0.3",
     "jquery": "2.0.3",
+    "jquery-ujs": "1.2.1",
     "underscore": "1.5.1",
     "requirejs": "~2.1.11",
     "require-css": "0.1.5",