From d954a8f4e4b1ba3673e2c3f42b01edffc604d4a7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 20 Mar 2014 13:54:59 +1100
Subject: [PATCH] Starting on the sidebar

---
 .../controllers/sidebar_controller.js.coffee          | 11 +++++++++++
 app/views/layouts/darkswarm.html.haml                 | 10 +++++++---
 app/views/shared/_login.html.haml                     |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee

diff --git a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
new file mode 100644
index 0000000000..27ec2bf091
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
@@ -0,0 +1,11 @@
+window.SidebarCtrl = Darkswarm.controller "SidebarCtrl", ($scope, $location) ->
+  $scope.active_sidebar = $location.path()
+  
+  $scope.$watch ->
+    $location.path()
+  , ->
+    $scope.active_sidebar = $location.path() 
+
+
+  $scope.visible = ->
+    $scope.active_sidebar != null and $scope.active_sidebar != ""
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index d6591cbf12..ba66b9446a 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -16,14 +16,18 @@
     = render partial: "shared/menu"
     = display_flash_messages
 
+    %section#sidebar{ role: "complementary", "ng-controller" => "SidebarCtrl", "ng-show" => "visible()"}
+      {{ active_sidebar }}
+      TEST ME
+      %a{href: "#"} close
+      = render partial: "shared/login_panel"
+      = yield :sidebar
+
     %section{ role: "main" }
       = yield
       
       #footer
 
-    %section#sidebar{ role: "complementary" }
-      = render partial: "shared/login_panel"
-      = yield :sidebar
 
     = yield :scripts
 
diff --git a/app/views/shared/_login.html.haml b/app/views/shared/_login.html.haml
index 67249aeb26..c46d0f424f 100644
--- a/app/views/shared/_login.html.haml
+++ b/app/views/shared/_login.html.haml
@@ -1,8 +1,8 @@
 - if spree_current_user.nil?
-  %li#login-link= link_to "Login", "#sidebar", id: "sidebarLoginButton", class: "sidebar-button"
+  %li#login-link= link_to "Login", "#login", id: "sidebarLoginButton", class: "sidebar-button"
   %li#login-name.hide
   %li.divider
-  %li#sign-up-link= link_to "Sign Up", "#sidebar", id: "sidebarSignUpButton", class: "sidebar-button"
+  %li#sign-up-link= link_to "Sign Up", "#signup", id: "sidebarSignUpButton", class: "sidebar-button"
   %li#sign-out-link.hide= link_to "Sign Out", "/logout"
 - else
   %li#login-link.hide= link_to "Login", "#sidebar", id: "sidebarLoginButton", class: "sidebar-button"