Merge pull request #808 from k88hudson/1026020

Bug 1026020 - Fix my profile, my settings
mozilla · Jun 17, 2014 · e370ff0 · e370ff0
2 parents 9907c86 + aa24249
commit e370ff0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/locale/en_US/explore.json b/locale/en_US/explore.json
@@ -12,7 +12,7 @@
     "description": "Link to literacy page"
   },
   "Get involved with webmaker": {
-    "message": "Webmaker is a part of Mozilla's <a href=\"/{{ lang }}/about\" external=\"true\">non-profit mission</a> to create a more open, web literate world.",
+    "message": "Webmaker is a part of Mozilla's <a href=\"/{{ lang }}/about\" external-link=\"true\">non-profit mission</a> to create a more open, web literate world.",
     "description": "Copy for first explore subsection with map"
   },
   "Web Literacy Map": {

diff --git a/public/js/angular/controllers.js b/public/js/angular/controllers.js
@@ -1,7 +1,7 @@
 angular
   .module('webmakerApp')
-  .controller('navigationController', ['$scope', '$location', '$routeParams', '$rootScope', 'weblit', 'wmNav',
-    function ($scope, $location, $routeParams, $rootScope, weblit, wmNav) {
+  .controller('navigationController', ['$scope', '$location', '$routeParams', '$rootScope', 'weblit', 'wmNav', 'CONFIG',
+    function ($scope, $location, $routeParams, $rootScope, weblit, wmNav, config) {
 
       // Nav data
       $scope.nav = {
@@ -88,6 +88,9 @@ angular
         ]
       };
 
+      // User urls
+      $scope.accountSettingsUrl = config.accountSettingsUrl;
+
       // Start with collapsed state for navigation
       $scope.primaryCollapse = true;
       $scope.secondaryCollapse = true;

diff --git a/public/views/partials/navigation.html b/public/views/partials/navigation.html
@@ -22,6 +22,7 @@
           </a>
           <ul class="dropdown-menu">
             <li><a href="/me" target="_blank"><span class="fa fa-th-large"></span> {{ 'My makes' | i18n }}</a></li>
+            <li><a href="/user/{{_user.username}}" external-link="true"><span class="fa fa-user"></span> {{ 'My Profile' | i18n }}</a></li>
             <li><a href="{{accountSettingsUrl}}" target="_blank"><span class="fa fa-cog"></span> {{ 'My Settings' | i18n }}</a></li>
             <li class="divider"></li>
             <li><a ng-click="logout()"><span class="fa fa-sign-out"></span> {{ 'Sign out' | i18n }}</a></li>