Fixed routes and updated pages

Author: Nishad Bakshi

app/templates/ui/app/create/create.html

@@ -1,4 +1,4 @@
-<div class="create" ng-show="ctrl.currentUser && !ctrl.currentUser.disallowUpdates">
+<div class="create" ng-show="$ctrl.currentUser && !$ctrl.currentUser.disallowUpdates">
   <div class="row">
     <div class="col-sm-2"></div>
     <h2 class="col-sm-10">Create a Document</h2>
@@ -112,7 +112,7 @@ <h2 class="col-sm-10">Create a Document</h2>
 
     <div class="row">
       <a class="col-sm-offset-10 btn btn-default" ui-sref="root.landing">Cancel</a>
-      <button class="btn btn-primary" ng-click="ctrl.submit()">Create</button>
+      <button class="btn btn-primary" ng-click="$ctrl.submit()">Create</button>
     </div>
   </form>
 </div>

app/templates/ui/app/root/root.html

@@ -15,7 +15,7 @@
       <ul class="nav navbar-nav">
         <li><a href="/">Home</a></li>
         <li><a href="/search">Search</a></li>
-        <li ng-show="ctrl.currentUser && !ctrl.currentUser.disallowUpdates"><a href="/create">Create</a></li>
+        <li ng-show="$ctrl.currentUser && !$ctrl.currentUser.disallowUpdates"><a href="/create">Create</a></li>
       </ul>
       <ml-user mode="inline"></ml-user>
     </div><!-- /.navbar-collapse -->

app/templates/ui/app/route/routes.js

@@ -41,12 +41,7 @@
       .state('root', {
         url: '',
         // abstract: true,
-        component: 'root',
-        resolve: {
-          user: function(userService) {
-            return userService.getUser();
-          }
-        }
+        component: 'root'
       })
       .state('root.landing', {
         url: '/',

app/templates/ui/app/user/profile.html

@@ -1,7 +1,7 @@
 <div ng-if="$ctrl.user" class="profile">
   <div class="row">
     <div class="col-md-2"></div>
-    <h2 class="col-md-10">Edit profile of {{ctrl.user.username}}</h2>
+    <h2 class="col-md-10">Edit profile of {{$ctrl.user.username}}</h2>
   </div>
   <form class="form-horizontal" name="profileForm">
     <div class="form-group">
@@ -10,7 +10,7 @@ <h2 class="col-md-10">Edit profile of {{ctrl.user.username}}</h2>
           <label class="control-label">Full name</label>
         </div>
         <div class="col-md-2">
-          <input type="text" class="form-control" placeholder="full name of user" ng-model="ctrl.user.profile.fullname" ng-disabled="ctrl.user.disallowUpdates">
+          <input type="text" class="form-control" placeholder="full name of user" ng-model="$ctrl.user.profile.fullname" ng-disabled="$ctrl.user.disallowUpdates">
         </div>
       </div>
     </div>
@@ -21,10 +21,10 @@ <h2 class="col-md-10">Edit profile of {{ctrl.user.username}}</h2>
           <label class="control-label">E-mail(s)</label>
         </div>
         <div class="col-md-6">
-          <input type="email" name="newEmail" class="form-control" placeholder="e-mail of user" ng-model="ctrl.newEmail" ng-disabled="ctrl.user.disallowUpdates">
+          <input type="email" name="newEmail" class="form-control" placeholder="e-mail of user" ng-model="$ctrl.newEmail" ng-disabled="$ctrl.user.disallowUpdates">
         </div>
         <div class="col-md-1">
-          <button class="btn btn-primary" ng-click="ctrl.addEmail()" ng-show="!ctrl.user.disallowUpdates">
+          <button class="btn btn-primary" ng-click="$ctrl.addEmail()" ng-show="!$ctrl.user.disallowUpdates">
             <span class="glyphicon glyphicon-plus"></span>
           </button>
         </div>
@@ -34,21 +34,21 @@ <h2 class="col-md-10">Edit profile of {{ctrl.user.username}}</h2>
       </div>
       <!-- always show add button -->
       <!-- repeat if there are emails -->
-      <div class="row" ng-repeat="email in ctrl.user.profile.emails track by $index">
+      <div class="row" ng-repeat="email in $ctrl.user.profile.emails track by $index">
         <div class="col-md-offset-2 col-md-6">
           <div class="input-group additional-email">
-            <input type="text" class="form-control" placeholder="e-mail of user" ng-model="ctrl.user.profile.emails[$index]" ng-disabled="ctrl.user.disallowUpdates">
-            <span class="input-group-addon btn-danger" ng-click="ctrl.removeEmail($index)" ng-show="!ctrl.user.disallowUpdates">
+            <input type="text" class="form-control" placeholder="e-mail of user" ng-model="$ctrl.user.profile.emails[$index]" ng-disabled="$ctrl.user.disallowUpdates">
+            <span class="input-group-addon btn-danger" ng-click="$ctrl.removeEmail($index)" ng-show="!$ctrl.user.disallowUpdates">
               <span class="glyphicon glyphicon-remove"></span>
             </span>
           </div>
         </div>
       </div>
     </div>
-    <div class="row" ng-show="!ctrl.user.disallowUpdates">
+    <div class="row" ng-show="!$ctrl.user.disallowUpdates">
       <div class="col-md-offset-7 col-md-5">
         <a class="btn btn-default" ui-sref="root.landing">Cancel</a>
-        <button class="btn btn-primary" ng-click="ctrl.submit(profileForm)">Submit</button>
+        <button class="btn btn-primary" ng-click="$ctrl.submit(profileForm)">Submit</button>
       </div>
     </div>
   </form>

app/templates/ui/app/user/user-component.html

@@ -7,7 +7,7 @@
   <!-- display the logged in user -->
   <div class="welcome" ng-if="$ctrl.currentUser">
     <div class="navbar-collapse collapse">
-      <span class="glyphicon glyphicon-user"></span> {{ $ctrl.currentUser.fullname || $ctrl.currentUser.name }} | <span class="profile-link"><a href="/profile">Account</a></span>
+      <span class="glyphicon glyphicon-user"></span> {{ $ctrl.currentUser.profile.fullname || $ctrl.currentUser.username }} | <span class="profile-link"><a href="/profile">Account</a></span>
 
       <button class="btn btn-danger btn-xs" type="button" ng-click="$ctrl.loginService.logout()">Logout</button>