Update status setting for contacts.

Remove commented out html.

Remove changed dom in default dialog.

Update status setting for contacts.

static/js/directives/contactrequest.js

@@ -51,10 +51,7 @@ define(['jquery', 'underscore'], function($, _) {
 			var request = $scope.request;
 			if (request.Success && request.Userid && request.Token) {
 				var buddy = buddyData.lookup($scope.id);
-				var status = {};
-				if (buddy) {
-					 status = angular.isObject(buddy.status) ? angular.extend(status, buddy.status) : buddy.status;
-				}
+				var status = null;
 				$scope.addContact(request, status);
 			}
 

static/js/services/buddylist.js

@@ -585,7 +585,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
 				scope.contact = contact;
 				var sessionData = scope.session.get();
 				if (sessionData) {
-					if (angular.isString(contact.Status) && sessionData.Status) {
+					if (contact.Status === null && sessionData.Status) {
 						// Update contact status with session.Status
 						var status = contact.Status = _.extend({}, sessionData.Status);
 						// Remove status message.

static/partials/contactsmanager.html

@@ -18,7 +18,6 @@
                 <span ng-if="!contact.Status.displayName" ng-init="i = incrementUnnamedCount()">Unnamed Contact {{i}}</span>
               </td>
               <td class="action">
-                <!-- <button class="btn btn-danger" ng-click="removeContact(contact.Userid)">{{_('Remove')}}</button> -->
                 <button class="btn btn-primary" ng-click="edit(contact)">{{_('Edit')}}</button>
               </td>
             </tr>

static/partials/defaultdialog.html

@@ -1,5 +1,5 @@
 <div>
 	<div class="modal-header"><button type="button" class="close" ng-click="$close()">×</button><h3 class="modal-title" ng-bind-html="header"></h3></div>
 	<div class="modal-body" ng-transclude></div>
-	<div class="modal-footer"><button type="button" class="btn btn-default" ng-click="$close()">{{_("Close")}}</button><span ng-bind-html="footer"></span></div>
+	<div class="modal-footer"><button type="button" class="btn btn-default" ng-click="$close()">{{_("Close")}}</button></div>
 </div>