From f9b292e80ebfe686e63e88094a9568f0d34bf44d Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 4 Feb 2015 12:30:12 -0300
Subject: [PATCH] Fix gravatar on sidebar

---
 index.html                         | 45 +++++++++++++++---------------
 js/controllers/head.js             |  2 +-
 js/controllers/sidebar.js          |  1 +
 views/includes/sidebar-mobile.html |  2 +-
 views/profile.html                 |  6 +++-
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/index.html b/index.html
index 68403923e..f237e4bf0 100644
--- a/index.html
+++ b/index.html
@@ -82,37 +82,38 @@
           <span translate> <strong class="size-16">Network Error</strong>.<br> Attempting to reconnect..</span>
         </div>
  
-        <div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation  && !$root.wpInputFocused">
-          <nav class="tab-bar">
-            <section class="left-small">
-              <a class="p10" 
-                ng-click="openMenu()"><i class="fi-list size-24"></i></a>
-            </section>
+        <div ng-if="$root.iden">
+          <div ng-controller="SidebarController" ng-show="!$root.hideNavigation  && !$root.wpInputFocused">
+            <nav class="tab-bar">
+              <section class="left-small">
+                <a class="p10" 
+                  ng-click="openMenu()"><i class="fi-list size-24"></i></a>
+              </section>
 
               <section class="right-small" 
-                ng-show="$root.iden && $root.wallet.isComplete() && !$root.hideWalletNavigation && isCordova">
+                ng-show="$root.wallet.isComplete() && !$root.hideWalletNavigation && isCordova">
                 <a class="p10" 
                   ng-click="openScanner()"><i class="fi-camera size-24"></i></a>
               </section>
 
-            <section class="middle tab-bar-section">
-                <h1 class="title ellipsis" ng-show="$root.iden && $root.wallet  && !$root.hideWalletNavigation">
-                    {{$root.wallet.getName()}}
+              <section class="middle tab-bar-section">
+                <h1 class="title ellipsis" ng-show="$root.wallet  && !$root.hideWalletNavigation">
+                  {{$root.wallet.getName()}}
                 </h1>
-            </section>
-          </nav>
+              </section>
+            </nav>
 
-          <nav class="left-off-canvas-menu" ng-show="$root.iden">
-            <div ng-include="'views/includes/sidebar-mobile.html'"></div>
-          </nav>
+            <nav class="left-off-canvas-menu">
+              <div ng-include="'views/includes/sidebar-mobile.html'"></div>
+            </nav>
 
-          <div ng-if="$root.iden"
-            ng-include="'views/includes/sidebar.html'" 
-            role='navigation'
-            class="sidebar"></div>
-          <div class="bottom-bar" ng-if="$root.wallet &&
-            $root.wallet.isComplete() && !$root.wallet.isLocked && !$root.hideWalletNavigation">
-            <div ng-include="'views/includes/bottombar-mobile.html'"></div>
+            <div ng-include="'views/includes/sidebar.html'" 
+              role='navigation'
+              class="sidebar"></div>
+            <div class="bottom-bar" ng-if="$root.wallet &&
+              $root.wallet.isComplete() && !$root.wallet.isLocked && !$root.hideWalletNavigation">
+              <div ng-include="'views/includes/bottombar-mobile.html'"></div>
+            </div>
           </div>
         </div>
 
diff --git a/js/controllers/head.js b/js/controllers/head.js
index a2b2e40db..9fbfb6bf1 100644
--- a/js/controllers/head.js
+++ b/js/controllers/head.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService) {
-  $scope.username = $rootScope.iden.getName();
+  $scope.username = $rootScope.iden ? $rootScope.iden.getName() : '';
   $scope.hoverMenu = false;
 
   var isChromeApp = typeof window !== "undefined" && window.chrome && chrome.runtime && chrome.runtime.id;
diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index ab1ee5ff1..8904f7a55 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
 
   $scope.isMobile = isMobile.any();
   $scope.isCordova = isCordova;
+  $scope.username = $rootScope.iden ? $rootScope.iden.getName() : '';
 
   $scope.menu = [{
     'title': 'Home',
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index 14904a91b..1964e7156 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -1,7 +1,7 @@
 <div ng-init="init()">
   <header ng-click="$root.go('profile')" class="text-center">
     <div class="photo-container">
-      <img gravatar-src="'{{$root.iden.getName()}}'" gravatar-size="45">
+      <img gravatar-src="'{{username}}'" gravatar-size="45">
     </div>
     <div class="m5t">
       <div class="text-white text-bold ellipsis size-14">{{$root.iden.getName()}}</div>
diff --git a/views/profile.html b/views/profile.html
index ce710ce9d..b0fd4825c 100644
--- a/views/profile.html
+++ b/views/profile.html
@@ -4,7 +4,11 @@
       <div class="panel">
         <div class="row collapse">
           <div class="large-2 medium-2 columns text-center">
-            <a class="photo-container profile" href="https://en.gravatar.com/" ng-init="isHover=0" ng-mouseenter="isHover=1" ng-mouseleave="isHover=0" target="_blank">
+            <a class="photo-container profile" 
+              ng-click="$root.openExternalLink('https://gravatar.com/')"
+              ng-init="isHover=0" 
+              ng-mouseenter="isHover=1" 
+              ng-mouseleave="isHover=0">
               <img ng-show="!isHover" gravatar-src="'{{username}}'" gravatar-size="80">
               <img ng-show="isHover" src="img/change-avatar.png" with="80">
             </a>