Merge pull request #2220 from rabuzarus/2812_notify_menu

vier: some visual work on the notification menu

diff --git a/js/main.js b/js/main.js
index ca4cc770cdef20c27f88e6ce2126164b6c023a17..5bcbc35bfb3e30c0cab74fff46a20b50b3ececc0 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -247,13 +247,18 @@
                                eNotif.children("note").each(function(){
                                        e = $(this);
                                        var text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
+                                       var contact = ("<a href="+e.attr('url')+"><span class='contactname'>"+e.attr('name')+"</span></a>");
                                        var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
-                                       var html = notifications_tpl.format(e.attr('href'),
-                                               e.attr('photo'),                    // {0}
-                                               text,                               // {1}
-                                               e.attr('date'),                     // {2}
-                                               seenclass,                          // {3}
-                                               new Date(e.attr('timestamp')*1000)  // {4}
+                                       var html = notifications_tpl.format(
+                                               e.attr('href'),                     // {0}  // link to the source
+                                               e.attr('photo'),                    // {1}  // photo of the contact
+                                               text,                               // {2}  // preformatet text (autor + text)
+                                               e.attr('date'),                     // {3}  // date of notification (time ago)
+                                               seenclass,                          // {4}  // vistiting status of the notification
+                                               new Date(e.attr('timestamp')*1000), // {5}  //date of notification
+                                               e.attr('url'),                      // {6}  // profile url of the contact
+                                               e.text().format(""),                // {7}  // clean status text
+                                               contact                             // {8}  //preformatat author (name + profile url)
                                        );
                                        nnm.append(html);
                                });

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index e53ac45f74ca2343b1b169eb95d6f74d108ead24..4719a273a5967fe0a5477ff2222c3ddd51ce1124 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -928,10 +928,33 @@ ul.menu-popup .empty {
   background-color: #bdcdd4;
 }*/
 
+#nav-notifications-menu > li {
+  display: block;
+  color: #737373;
+  cursor: pointer;
+}
+
+#nav-notifications-menu > li:hover {
+  background-color: #e5e5e5;
+  color: #000;
+}
+#nav-notifications-mark-all a {
+  color: #737373;
+}
+
 #nav-notifications-menu img {
-  float: left;
-  margin-right: 5px;
+  width: 32px;
+  height: 32px;
+  border-radius: 5px;
+  margin: 0;
+  padding: 0;
 }
+
+#nav-notifications-menu .notif-desc-wrapper a {
+  display: inline;
+  padding: 0px;
+}
+
 #nav-notifications-menu .contactname {
   font-weight: bold;
 }
@@ -947,6 +970,25 @@ ul.menu-popup .empty {
         padding: 7px 7px 0px 0px;
 }
 
+.notif-entry-wrapper {
+  padding: 5px 10px;
+  min-height: 32px;
+  /*border-bottom: 1px solid #DDDDDD;*/
+}
+
+.notif-photo-wrapper {
+  float: left;
+  margin-right: 10px;
+}
+
+.notif-photo-wrapper a {
+  padding: 0 !important;
+}
+
+.notif-desc-wrapper {
+  overflow: hidden;
+}
+
 right_aside {
   display: none;
   vertical-align: top;

diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index 77bad93705bb20a6421bd35945cf6d5a77294cf1..320343bef87f260e46f52e199b972585a537b241 100644 (file)
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -109,7 +109,15 @@
 
 </nav>
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-       <li class="{4}"><a href="{0}" title="{5}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+       <li class="{4}" onclick="location.href='{0}';">
+               <div class="notif-entry-wrapper">
+                       <div class="notif-photo-wrapper"><a href="{6}"><img data-src="{1}"></a></div>
+                       <div class="notif-desc-wrapper">
+                               {8}{7}
+                               <div><time class="notif-when" title="{5}">{3}</time></div>
+                       </div>
+               </div>
+       </li>
 </ul>
 <!--
 <div class="icon-flag" style="position: fixed; bottom: 10px; left: 20px; z-index:9;">{{$langselector}}</div>