assume logged-in user, rm userBus

4 files changed, 19 insertions, 43 deletions

diff --git a/res/css/style.css b/res/css/style.css
index bac33349..637939c3 100644
--- a/res/css/style.css
+++ b/res/css/style.css
@@ -310,6 +310,18 @@ table {
   font-family: "Source_Regular", sans-serif;
   color: #919095; }
 
+.button {
+}
+
+.button:hover {
+  opacity: 0.7;
+}
+
+#logout-button {
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
 .add-button {
   position: relative;
   height: 30px;
diff --git a/src/buttons.js b/src/buttons.js
index c147c2a6..ad60668e 100644
--- a/src/buttons.js
+++ b/src/buttons.js
@@ -67,37 +67,9 @@ $('.local-storage-load a').click(function(){
   rz_core.load_from_json(json_blob);
 });
 
-var username_label = $('#username-label'),
-    username_form = $('#username-form'),
-    username_input = $('#username-input'),
-    username_default_text = 'logged out';
-
-var onUserSet = function(user) {
-    if (user) {
-        username_label.html(user);
-        username_label.show();
-        username_form.hide();
-        $('.save-history').show();
-    } else {
-        username_label.html(username_default_text);
-        username_label.hide();
-        username_form.show();
-    }
-}
-
-rz_core.graph.userBus.onValue(onUserSet);
-
-username_form.submit(function() {
-    var user = username_input.val();
-    rz_core.graph.set_user(user);
-    return false;
-});
-username_label.click(function() {
-    username_label.hide();
-    username_input.val(
-        username_label.text() == username_default_text ? 'J. Doe' :
-        username_label.text());
-    username_form.show();
+var logout_button = $('#logout-button');
+logout_button.click(function() {
+    $.ajax({ type: "POST", url: '/logout'}); // server should redirect back to /login
 });
 
 $('a.save-history').click(function() {
diff --git a/src/model/graph.js b/src/model/graph.js
index 29fad587..19692073 100644
--- a/src/model/graph.js
+++ b/src/model/graph.js
@@ -9,11 +9,8 @@ function Graph() {
 
     var nodes = [],
         links = [],
-        user,
-        userBus = new Bacon.Bus(),
         diffBus = new Bacon.Bus();
 
-    this.userBus = userBus;
     this.diffBus = diffBus;
 
     /**
@@ -626,10 +623,7 @@ function Graph() {
     this.set_user = function(user) {
         var elem = $('svg g.zoom')[0];
         this.user = user;
-
         this.history = new history.History(this.user, this, elem);
-        console.log('new user: ' + this.user);
-        this.userBus.push(this.user);
     }
 
     function clear_history() {
@@ -691,12 +685,6 @@ function Graph() {
         return selected;
     }
 
-    user = util.getParameterByName('user');
-    if (user) {
-        var self = this;
-        console.log('setting user from parameter to: ' + user);
-        setTimeout(function() { self.set_user(user); }, 0);
-    }
 }
 
 return {
diff --git a/src/rz_core.js b/src/rz_core.js
index 46fc753a..b2643f09 100644
--- a/src/rz_core.js
+++ b/src/rz_core.js
@@ -62,7 +62,11 @@ var initDrawingArea = function () {
         }
     }
 
+    var user_id = $('#user_id').text();
+    console.log('found user ID: \'' + user_id + '\'');
+
     graph = new model_graph.Graph();
+    graph.set_user(user);
 
     var el = document.body;
     vis = d3.select(el).append("svg:svg")