From d77f94d31965cc18d8ced5515674e249b60294d3 Mon Sep 17 00:00:00 2001
From: alex <demeshko.alexander.v@gmail.com>
Date: Thu, 17 Dec 2015 19:25:29 +0300
Subject: [PATCH] fix mail page

---
 src/app/pages/mail/MailCtrl.js                | 31 +++++++++----------
 src/app/pages/mail/blurEmail.html             |  4 +--
 src/app/pages/mail/mail.html                  |  2 +-
 .../contentTop/contentTop.directive.js        |  1 +
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/app/pages/mail/MailCtrl.js b/src/app/pages/mail/MailCtrl.js
index 62a4881..eb7af77 100644
--- a/src/app/pages/mail/MailCtrl.js
+++ b/src/app/pages/mail/MailCtrl.js
@@ -9,12 +9,11 @@
       .controller('MailCtrl', MailCtrl);
 
   /** @ngInject */
-  function MailCtrl($scope, $routeParams, $location, $sce) {
-    console.log($routeParams);
+  function MailCtrl($scope, $location, $sce) {
     $scope.messages = [
       {
         "id": "4563faass",
-        "name": "Anastasiya Tyshkavets",
+        "name": "Nasta Tyshkavets",
         "subject": "Great text",
         "date": "2015-08-28T07:57:09",
         "important": true,
@@ -29,7 +28,7 @@
       },
       {
         "id": "4563fdfvd",
-        "name": "Anastasiya Tyshkavets",
+        "name": "Nasta Tyshkavets",
         "subject": "Lores ipsum",
         "date": "2015-11-19T03:30:45",
         "important": false,
@@ -44,7 +43,7 @@
       },
       {
         "id": "4563zxcss",
-        "name": "Anastasiya Tyshkavets",
+        "name": "Nasta Tyshkavets",
         "subject": "Lores ipsum",
         "date": "2015-10-19T03:30:45",
         "important": false,
@@ -58,7 +57,7 @@
       },
       {
         "id": "8955sddf",
-        "name": "Nikolass Cat",
+        "name": "Nick Cat",
         "subject": "New Design",
         "date": "2015-05-05T12:59:45",
         "important": true,
@@ -74,7 +73,7 @@
       },
       {
         "id": "8955sdfcc",
-        "name": "Nikolass Cat",
+        "name": "Nick Cat",
         "subject": "Gift card",
         "date": "2015-07-18T10:19:01",
         "important": false,
@@ -88,7 +87,7 @@
       },
       {
         "id": "8955asewf",
-        "name": "Nikolass Cat",
+        "name": "Nick Cat",
         "subject": "Some news",
         "date": "2015-09-23T03:04:10",
         "important": true,
@@ -102,7 +101,7 @@
       },
       {
         "id": "2334uudsa",
-        "name": "Konstantin Danovsky",
+        "name": "Kostya Danovsky",
         "subject": "Street Art",
         "date": "2015-11-22T10:05:09",
         "important": false,
@@ -121,7 +120,7 @@
       },
       {
         "id": "2334aefvv",
-        "name": "Konstantin Danovsky",
+        "name": "Kostya Danovsky",
         "subject": "New product",
         "date": "2015-06-22T06:26:10",
         "important": true,
@@ -139,7 +138,7 @@
       },
       {
         "id": "8223xzxfn",
-        "name": "Andrei Hrabouski",
+        "name": "Andrey Hrabouski",
         "subject": "Skype moji",
         "date": "2015-07-16T06:47:53",
         "important": false,
@@ -154,7 +153,7 @@
       },
       {
         "id": "8223sdffn",
-        "name": "Andrei Hrabouski",
+        "name": "Andrey Hrabouski",
         "subject": "My App",
         "date": "2015-06-20T07:05:02",
         "important": false,
@@ -170,7 +169,7 @@
       },
       {
         "id": "9391xdsff",
-        "name": "Vladimir Lugovsky",
+        "name": "Vlad Lugovsky",
         "subject": "Cool",
         "date": "2015-03-31T11:52:58",
         "important": false,
@@ -187,7 +186,7 @@
       },
       {
         "id": "9391xdsff",
-        "name": "Vladimir Lugovsky",
+        "name": "Vlad Lugovsky",
         "subject": "Whan next",
         "date": "2015-03-31T11:52:58",
         "important": false,
@@ -292,9 +291,9 @@
       return i === $scope.currentMessages.length ? 0 : i;
     }
 
-    $scope.tab = findTabByLabel($routeParams.label);
+    $scope.tab = findTabByLabel(0);
     $scope.currentMessages = $scope.tabs[$scope.tab].filter($scope.messages);
-    $scope.mail = $scope.currentMessages[findMessageById($routeParams.id)];
+    $scope.mail = $scope.currentMessages[findMessageById(0)];
   }
 
 })();
diff --git a/src/app/pages/mail/blurEmail.html b/src/app/pages/mail/blurEmail.html
index 603fd38..1fa5a69 100644
--- a/src/app/pages/mail/blurEmail.html
+++ b/src/app/pages/mail/blurEmail.html
@@ -68,7 +68,7 @@
         <table>
           <tr ng-repeat="m in currentMessages | orderBy:'-date'" class="little-human {{m == mail ? 'active' : ''}}"
               ng-click="selectMail(m)">
-            <td><img ng-src="{{m.pic}}" class="little-human-picture"></td>
+            <td><img ng-src="{{m.name.split(' ')[0] | profilePicture}}" class="little-human-picture"></td>
             <td><span class="name">{{m.name.split(' ')[0] + ' ' + m.name.split(' ')[1][0]}}.</span></td>
             <td class="additional-info"><span class="tag label label-primary {{m.tag}}">{{m.tag}}</span></td>
             <td class="additional-info"><span class="subject">{{m.subject}}</span></td>
@@ -81,7 +81,7 @@
       <div class="message" ng-show="mail">
         <div class="person-info row">
           <div class="col-lg-4 col-sm-4 col-xs-12 no-padding">
-            <img ng-src="{{mail.pic}}" class="human-picture">
+            <img ng-src="{{mail.name.split(' ')[0] | profilePicture}}" class="human-picture">
 
             <div class="name">
               <h2>{{mail.name.split(' ')[0]}}</h2>
diff --git a/src/app/pages/mail/mail.html b/src/app/pages/mail/mail.html
index 0ea76cb..0f52567 100644
--- a/src/app/pages/mail/mail.html
+++ b/src/app/pages/mail/mail.html
@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-12 col-sm-12">
-    <blur-panel class-container="large-panel">
+    <blur-panel class-container="with-scroll">
       <blur-email></blur-email>
     </blur-panel>
   </div>
diff --git a/src/app/theme/components/contentTop/contentTop.directive.js b/src/app/theme/components/contentTop/contentTop.directive.js
index 2f8a9cc..ba1850e 100644
--- a/src/app/theme/components/contentTop/contentTop.directive.js
+++ b/src/app/theme/components/contentTop/contentTop.directive.js
@@ -29,6 +29,7 @@
           '/icons': 'Icons',
           '/login': 'Authentication',
           '/maps': 'Maps',
+          '/mail': 'Mail',
           '/modals': 'Modals',
           '/profile': 'User Profile',
           '/tables': 'Tables',