moved login to landing page

mozilla · Nov 13, 2013 · 508bc17 · 508bc17
1 parent df20c28
commit 508bc17
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/public/javascripts/controllers.js b/public/javascripts/controllers.js
@@ -71,9 +71,10 @@ angular.module('chatspace.controllers', []).
       persona.logout();
     }
   }).
-  controller('HomeCtrl', function ($scope, $location, persona) {
+  controller('HomeCtrl', function ($scope, $rootScope, $location, persona) {
     $scope.login = function () {
       persona.login();
+      $rootScope.toggleSettings();
     };
   }).
   controller('DraftsCtrl', function ($scope, $rootScope, $location, api) {

diff --git a/public/partials/home.html b/public/partials/home.html
@@ -1,3 +1,5 @@
 <div class="landing-view">
-  <h2>landing page</h2>
+  <h2>Chatspaces</h2>
+
+  <a href="javascript:;" ng-click="login()" class="persona">Sign in with Persona</a>
 </div>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
@@ -75,6 +75,16 @@ body, textarea, input {
     overflow-x: auto;
 }
 
+.persona {
+    background-color: #bbb;
+    color: #eee;
+    display: inline-block;
+    font-size: 2rem;
+    margin-top: 20px;
+    padding: 10px;
+    text-decoration: none;
+}
+
 textarea {
     height: 70px;
     padding: 10px;

diff --git a/views/index.jade b/views/index.jade
@@ -15,8 +15,7 @@ block content
           a(href='/drafts', ng-click='toggleSettings()') Drafts
         li(ng-if='isAuthenticated')
           a(href='javascript:;', ng-click='logout()') Logout
-        li(ng-if='!isAuthenticated')
-          a(href='javascript:;', ng-click='login()') Sign in
+
     section.default
       div(ng-view)
 
diff --git a/views/layout.jade b/views/layout.jade
@@ -9,7 +9,7 @@ html(ng-app='chatspace')
     link(rel='stylesheet', href='/stylesheets/main.css')
 
   body(ng-controller='AppCtrl')
-    #header
+    #header(ng-if='isAuthenticated')
       button(class='toggle', ng-click='toggleSettings()') ≡
       a(id='notifications', href='javascript:;', ng-click='goToDashboard()', ng-class='{ on: hasNewNotifications }', ng-bind='hasNewNotifications')