Merge pull request #2220 from rabuzarus/2812_notify_menu

vier: some visual work on the notification menu

diff --combined js/main.js
index ca4cc770cdef20c27f88e6ce2126164b6c023a17,b28b1079b73c181f8d8eb240c9ef5090330bab98..5bcbc35bfb3e30c0cab74fff46a20b50b3ececc0
--- 1/js/main.js
--- 2/js/main.js
+++ b/js/main.js
@@@ -1,22 -1,22 +1,22 @@@
 -  function resizeIframe(obj) {
 -    obj.style.height = 0;
 -      _resizeIframe(obj, 0);
 -  }
 -  
 -  function _resizeIframe(obj, desth) {
 -      var h = obj.style.height;
 -      var ch = obj.contentWindow.document.body.scrollHeight + 'px';
 -      if (h==ch) {
 -              return;
 +      function resizeIframe(obj) {
 +              //obj.style.height = 0;
 +              _resizeIframe(obj, 0);
        }
 -      console.log("_resizeIframe", obj, desth, ch);
 -      if (desth!=ch) {
 -              setTimeout(_resizeIframe, 500, obj, ch);
 -      } else {
 -              obj.style.height  = ch;
 -              setTimeout(_resizeIframe, 1000, obj, ch);
 +
 +      function _resizeIframe(obj, desth) {
 +              var h = obj.style.height;
 +              var ch = obj.contentWindow.document.body.scrollHeight + 'px';
 +              if (h==ch) {
 +                      return;
 +              }
 +              console.log("_resizeIframe", obj, desth, ch);
 +              if (desth!=ch) {
 +                      setTimeout(_resizeIframe, 500, obj, ch);
 +              } else {
 +                      if (ch>0) obj.style.height  = ch;
 +                      setTimeout(_resizeIframe, 1000, obj, ch);
 +              }
        }
 -  }
  
    function openClose(theID) {
      if(document.getElementById(theID).style.display == "block") {
@@@ -247,13 -247,18 +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 --combined view/theme/vier/style.css
index e53ac45f74ca2343b1b169eb95d6f74d108ead24,7bd8ab531010dffc46c55a2e8d5a4ff7ea1cf366..4719a273a5967fe0a5477ff2222c3ddd51ce1124
--- 1/view/theme/vier/style.css
--- 2/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@@ -928,10 -928,33 +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 +970,25 @@@
          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;
@@@ -2522,25 -2564,6 +2564,25 @@@ blockquote 
      display: block;
  }
  
 +.oembed.video .embed_video > div {
 +    position: absolute; top: 0px; left: 0px;
 +    background-color: rgba(0,0,0,0.5);
 +}
 +.oembed.video .embed_video > div::before {
 +    font-family: FontAwesome;
 +    font-weight: normal;
 +    font-style: normal;
 +    display: inline-block;
 +    text-decoration: inherit;
 +    vertical-align: top;
 +    font-size: 3em;
 +    content: "\f01d"; /* icon-play-circle */
 +    color: #fff;
 +    bottom: 10px;
 +    right: 10px;
 +    position: absolute;
 +}
 +
  /* ================== */
  /* = Contacts Block = */
  /* ================== */