From 12027f3e1fd55e650f8a8c4894cd9fa2ac6de045 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Tue, 8 Dec 2015 20:19:15 +0000
Subject: [PATCH] Fixed notifications

---
 client/app/components/navbar/navbar.html      | 39 ++++++---------
 client/app/components/navbar/navbar.less      | 50 -------------------
 .../notifications/notifications.html          |  7 ++-
 .../notifications/notifications.less          |  5 ++
 client/app/helpers/social.js                  |  2 -
 5 files changed, 26 insertions(+), 77 deletions(-)

diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index b1fdf83..c62fd8f 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -16,11 +16,25 @@
                 <span>Upload</span>
             </a>
         </li>
+        <li>
+            <form class="navbar-form" role="search">
+                <div class="input-group">
+                    <input type="text" ng-model="selected" placeholder="Search..."
+                           typeahead="result for results in getSearchResults($viewValue)"
+                           typeahead-template-url="app/views/templates/searchResult.html"
+                           typeahead-loading="loadingSearchResults"
+                           class="form-control"/>
+                    <div class="input-group-btn">
+                        <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
+                    </div>
+                </div>
+            </form>
+        </li>
     </ul>
     <div class="user" ng-if="$root.currentUser">
         <ul class="icon-nav">
-            <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <li class="dropdown" id="notifications">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-button">
                     <i class="fa fa-envelope"></i>
                     <span class="label label-lightred">{{notificationCount}}</span>
                 </a>
@@ -52,27 +66,6 @@
         </div>
     </div>
     <ul class="main-nav pull-right">
-        <li>
-            <form action="" class="search-form">
-                <div class="form-group has-feedback">
-                    <label for="search" class="sr-only">Search</label>
-                    <input type="text" class="form-control" name="search" id="search" placeholder="search">
-                    <span class="glyphicon glyphicon-search form-control-feedback"></span>
-                </div>
-            </form>
-            <!--
-            <form class="search-form">
-                <div class="search-pane">
-                    <input type="text" ng-model="selected" placeholder="Search..."
-                           typeahead="result for results in getSearchResults($viewValue)"
-                           typeahead-template-url="app/views/templates/searchResult.html"
-                           typeahead-loading="loadingSearchResults"
-                           class="form-control"/>
-                    <i ng-show="loadingSearchResults" class="glyphicon glyphicon-refresh"></i>
-                </div>
-            </form>
-            -->
-        </li>
         <li class="ms-hover" ng-if="!$root.currentUser">
             <a href="#" data-toggle="dropdown" class="dropdown-toggle">
                 Login/Signup
diff --git a/client/app/components/navbar/navbar.less b/client/app/components/navbar/navbar.less
index 119ca3b..2dd29f3 100644
--- a/client/app/components/navbar/navbar.less
+++ b/client/app/components/navbar/navbar.less
@@ -38,53 +38,3 @@ div.social-buttons a {
 }
 
 
-.search-form .form-group {
-  float: right !important;
-  transition: all 0.35s, border-radius 0s;
-  width: 32px;
-  height: 32px;
-  background-color: #fff;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
-  border-radius: 25px;
-  border: 1px solid #ccc;
-}
-.search-form .form-group input.form-control {
-  padding-right: 20px;
-  border: 0 none;
-  background: transparent;
-  box-shadow: none;
-  display:block;
-}
-.search-form .form-group input.form-control::-webkit-input-placeholder {
-  display: none;
-}
-.search-form .form-group input.form-control:-moz-placeholder {
-  /* Firefox 18- */
-  display: none;
-}
-.search-form .form-group input.form-control::-moz-placeholder {
-  /* Firefox 19+ */
-  display: none;
-}
-.search-form .form-group input.form-control:-ms-input-placeholder {
-  display: none;
-}
-.search-form .form-group:hover,
-.search-form .form-group.hover {
-  width: 100%;
-  border-radius: 4px 25px 25px 4px;
-}
-.search-form .form-group span.form-control-feedback {
-  position: absolute;
-  top: -1px;
-  right: -2px;
-  z-index: 2;
-  display: block;
-  width: 34px;
-  height: 34px;
-  line-height: 34px;
-  text-align: center;
-  color: #3596e0;
-  left: initial;
-  font-size: 14px;
-}
\ No newline at end of file
diff --git a/client/app/directives/notifications/notifications.html b/client/app/directives/notifications/notifications.html
index 53d27f2..d9dd294 100644
--- a/client/app/directives/notifications/notifications.html
+++ b/client/app/directives/notifications/notifications.html
@@ -1,8 +1,11 @@
 <li ng-repeat="notification in notifications">
-    <a ui-sref="root.mixes.mix({slug: notification.target})">
+    <a ui-sref="root.mixes.mix({slug: notification.target})"
+       ng-class="notification.accepted_date ? '' : 'notification-new'">
         <img ng-src="{{notification.from_user.profile_image_small}}" alt="">
         <div class="details">
-            <div class="name">{{notification.from_user.display_name}}</div>
+            <div class="name">
+                    {{notification.from_user.first_name}}
+            </div>
             <div class="message">
                 {{notification.verb}}&nbsp;{{notification.target_desc}}
             </div>
diff --git a/client/app/directives/notifications/notifications.less b/client/app/directives/notifications/notifications.less
index 15c2cf6..0ade167 100644
--- a/client/app/directives/notifications/notifications.less
+++ b/client/app/directives/notifications/notifications.less
@@ -2,3 +2,8 @@
     overflow: scroll;
     overflow-x: hidden;
 }
+
+.notification-new .message{
+    font-weight: bold;
+}
+
diff --git a/client/app/helpers/social.js b/client/app/helpers/social.js
index cd435c3..5292c01 100644
--- a/client/app/helpers/social.js
+++ b/client/app/helpers/social.js
@@ -1,5 +1,4 @@
 var helpers = helpers || {};
-/*
 if (FB) {
     FB.init({
         appId: '154504534677009',
@@ -9,7 +8,6 @@ if (FB) {
         version: 'v2.3'
     });
 }
-*/
 helpers.social = {
     postToFacebook: function (mix) {
         FB.getLoginStatus(function (oResponse) {