Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-e.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-e.png
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-e.png	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-e.png	(working copy)

Property changes on: src/webui/webui/htdocs/new/src/client/app/images/icon-e.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-f.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-f.png
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-f.png	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/images/icon-f.png	(working copy)

Property changes on: src/webui/webui/htdocs/new/src/client/app/images/icon-f.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.controller.js
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.controller.js	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.controller.js	(working copy)
@@ -101,11 +101,6 @@
                         return;
                     }
                 }
-                if (angular.isUndefined(addViewModal.phone) || !addViewModal.phone) {
-                    var errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('Phone')]);
-                    addViewModal.errorMsg = errorMsg;
-                    return;
-                }
                 addViewModal.showProgressBar();
                 addViewModal.root = 0;
                 if (addViewModal.userType === "Super Admin") addViewModal.root = 1;
@@ -145,3 +140,4 @@
             };
         }
     ]);
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.html
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.html	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.html	(working copy)
@@ -49,12 +49,6 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-md-3">{{ 'Phone' | T }}</label>
-                <div class="col-md-9">
-                    <input type="number" class="form-control" ng-model="userAdd.phone">
-                </div>
-            </div>
-            <div class="form-group">
                 <div class="col-md-offset-3 col-md-9 errorMsg">{{userAdd.errorMsg}}</div>
             </div>
             <div class="form-group">
@@ -74,3 +68,4 @@
         width: 700px;
     }
 </style>
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.controller.js
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.controller.js	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.controller.js	(working copy)
@@ -86,11 +86,6 @@
                     }
                 }
 
-                if (angular.isUndefined(editViewModal.data.phone_num) || editViewModal.data.phone_num.trim() === '') {
-                    editViewModal.errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('Phone')]);
-                    return;
-                }
-
                 editViewModal.showProgressBar();
                 var data = {
                     passwords: editViewModal.data.realPassword1,
@@ -116,3 +111,4 @@
             };
         }
     ]);
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.html
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.html	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.html	(working copy)
@@ -50,12 +50,6 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-md-3">{{ 'Phone' | T }}</label>
-                <div class="col-md-8">
-                    <input type="text" class="form-control" ng-model="userEdit.data.phone_num">
-                </div>
-            </div>
-            <div class="form-group">
                 <div class="col-md-offset-3 col-md-8 errorMsg">{{userEdit.errorMsg}}</div>
             </div>
             <div class="form-group">
@@ -73,3 +67,4 @@
         width: 700px;
     }
 </style>
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/OEM/less/ComposerUI/global/navbar.less
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/OEM/less/ComposerUI/global/navbar.less	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/OEM/less/ComposerUI/global/navbar.less	(working copy)
@@ -5,7 +5,6 @@
     .navbar-brand {
         height: 60px;
         line-height: 60px;
-        background-color: #2a677a;
         width: auto;
         padding: 0 15px;
         color: #fff;
@@ -13,8 +12,9 @@
         font-weight: bold;
         img {
             width: 52%;
-            margin-left: auto;
+            margin-left: 10px;
             margin-right: auto;
+            margin-top: -3px;
         }
     }
     .navbar-brand:hover {
@@ -44,4 +44,5 @@
     .badge {
         top: 28px !important;
     }
-}
\ No newline at end of file
+}
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/navbar.less
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/navbar.less	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/navbar.less	(working copy)
@@ -2,13 +2,13 @@
     background-color: #3576be;
     .navbar-brand {
         padding: 7px 0;
-        background-color: #165499;
         width: 218px;
         margin-left: -15px !important;
         img {
             width: 52%;
-            margin-left: auto;
+            margin-left: 10px;
             margin-right: auto;
+            margin-top: -3px;
         }
     }
     .navbar-brand:hover {
@@ -31,4 +31,5 @@
 }
 .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
     background-color: transparent !important;
-}
\ No newline at end of file
+}
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/navbar.less
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/navbar.less	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/navbar.less	(working copy)
@@ -105,13 +105,13 @@
     background-color: #3576be;
     .navbar-brand {
         padding: 7px 0;
-        background-color: #165499;
         width: 218px;
         margin-left: -15px !important;
         img {
             width: 52%;
-            margin-left: auto;
+            margin-left: 10px;
             margin-right: auto;
+            margin-top: -3px;
         }
     }
     .navbar-brand:hover {
@@ -135,3 +135,4 @@
 .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
     background-color: transparent !important;
 }
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/package.json
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/package.json	(revision 2464)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/package.json	(working copy)
@@ -20,7 +20,8 @@
     "gulp-json-editor": "^2.2.1",
     "gulp-po-json": "0.0.4",
     "load-grunt-tasks": "^3.5.0",
-    "time-grunt": "^1.3.0"
+    "time-grunt": "^1.3.0",
+    "grunt-cli": "^1.5.0"
   },
   "engines": {
     "node": ">=0.10.0"
@@ -28,5 +29,8 @@
   "scripts": {
     "test": "karma start test\\karma.conf.js"
   },
-  "dependencies": {}
+  "dependencies": {
+    "coffeescript": "^2.7.0"
+  }
 }
+