From 3bb395e8e315b4e61ce5e661f0606bb09d861c08 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Wed, 2 May 2012 00:10:31 -0400
Subject: style cleanups

---
 alias-angular/app/css/app.less      |  6 +++---
 alias-angular/app/index.html        | 10 +++++-----
 alias-angular/app/js/controllers.js |  6 +++---
 alias-angular/app/js/directives.js  |  8 --------
 4 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'alias-angular')

diff --git a/alias-angular/app/css/app.less b/alias-angular/app/css/app.less
index c79c56a..12d5588 100644
--- a/alias-angular/app/css/app.less
+++ b/alias-angular/app/css/app.less
@@ -44,15 +44,15 @@ html, body{
             padding: 1em 1em;
             color: #363636;
             .transition(0.3s);
-            
+
             &:hover{
                 background-color: @background-gray;
             }
-            
+
             &:first-child{
                 border-top: 1px solid @border-gray;
             }
-            
+
             i{
                 font-size:120%;
             }
diff --git a/alias-angular/app/index.html b/alias-angular/app/index.html
index 466a02a..6ed6488 100644
--- a/alias-angular/app/index.html
+++ b/alias-angular/app/index.html
@@ -28,14 +28,14 @@
           <a class="btn">
             <i class='{{self["status"]}} icon-user'></i> {{self["jid"]}}
           </a>
-          <a class="btn dropdown-toggle" data-toggle="dropdown" dropdown-toggle="toto" href="#">
+          <a class="btn dropdown-toggle" data-toggle="dropdown">
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu">
-            <li><a ng-click='status("chat")'><i class="chat icon-user"></i> Online</a></li>
-            <li><a ng-click='status("away")'><i class="away icon-user"></i> Away</a></li>
-            <li><a ng-click='status("dnd")'><i class="dnd icon-user"></i> Do Not Disturb</a></li>
-            <li><a ng-click='status("xa")'><i class="xa icon-user"></i> Extended Away</a></li>
+            <li><a ng-click='setStatus("chat")'><i class="available icon-user"></i> Online</a></li>
+            <li><a ng-click='setStatus("away")'><i class="away icon-user"></i> Away</a></li>
+            <li><a ng-click='setStatus("dnd")'><i class="dnd icon-user"></i> Do Not Disturb</a></li>
+            <li><a ng-click='setStatus("xa")'><i class="xa icon-user"></i> Extended Away</a></li>
           </ul>
         </div>
       </div>
diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js
index 33feb0d..bbcd7f5 100644
--- a/alias-angular/app/js/controllers.js
+++ b/alias-angular/app/js/controllers.js
@@ -94,9 +94,9 @@ function RosterCtl($scope, StropheSrv, $log, $rootScope) {
     $scope.chatWith = function(contact) {
         $rootScope.$broadcast('msgrequest', contact.name||contact.jid);
     };
-    
-    $scope.status = function(status) {
-        var pres = $pres().c("show",{},status);
+
+    $scope.setStatus = function(status) {
+        var pres = $pres().c("show", {}, status);
         StropheSrv.send(pres);
         $rootScope.self["status"] = status;
     };
diff --git a/alias-angular/app/js/directives.js b/alias-angular/app/js/directives.js
index cb7e70d..3b9b652 100644
--- a/alias-angular/app/js/directives.js
+++ b/alias-angular/app/js/directives.js
@@ -28,12 +28,4 @@ angular.module('Alias.directives', []).
             }
         };
         return directiveDefinition;
-    }).directive('dropdownToggle', function($log) {
-        var directiveDefinition = {
-            restrict: 'A',
-            link: function(scope, elm, attrs) {
-                elm.dropdown();
-            }
-        };
-        return directiveDefinition;
     });
-- 
cgit v1.2.3-70-g09d2