some work on vier nav-notification-menu
This commit is contained in:
parent
9d83892151
commit
093a3e6742
17
js/main.js
17
js/main.js
|
@ -247,13 +247,18 @@
|
||||||
eNotif.children("note").each(function(){
|
eNotif.children("note").each(function(){
|
||||||
e = $(this);
|
e = $(this);
|
||||||
var text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
|
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 seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
|
||||||
var html = notifications_tpl.format(e.attr('href'),
|
var html = notifications_tpl.format(
|
||||||
e.attr('photo'), // {0}
|
e.attr('href'), // {0} // link to the source
|
||||||
text, // {1}
|
e.attr('photo'), // {1} // photo of the contact
|
||||||
e.attr('date'), // {2}
|
text, // {2} // preformatet text (autor + text)
|
||||||
seenclass, // {3}
|
e.attr('date'), // {3} // date of notification (time ago)
|
||||||
new Date(e.attr('timestamp')*1000) // {4}
|
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);
|
nnm.append(html);
|
||||||
});
|
});
|
||||||
|
|
|
@ -917,7 +917,8 @@ ul.menu-popup .empty {
|
||||||
#nav-notifications-menu {
|
#nav-notifications-menu {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
max-height: 550px;
|
max-height: 550px;
|
||||||
overflow: auto;
|
overflow: hidden;
|
||||||
|
posistion: absolute;
|
||||||
}
|
}
|
||||||
/* #nav-notifications-menu a {
|
/* #nav-notifications-menu a {
|
||||||
display: inline;
|
display: inline;
|
||||||
|
@ -928,10 +929,31 @@ ul.menu-popup .empty {
|
||||||
background-color: #bdcdd4;
|
background-color: #bdcdd4;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
#nav-notifications-menu img {
|
|
||||||
float: left;
|
/* überleugung das zu löschen: begin*/
|
||||||
margin-right: 5px;
|
#nav-notifications-menu > li {
|
||||||
|
display: block;
|
||||||
|
color: #737373;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#nav-notifications-menu > li:hover {
|
||||||
|
background-color: #e5e5e5;
|
||||||
|
color: #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#nav-notifications-menu img {
|
||||||
|
width: 35px;
|
||||||
|
height: 35px;
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#nav-notifications-menu .notif-desc-wrapper a {
|
||||||
|
display: inline;
|
||||||
|
/* color: #2d2d2d;*/
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
#nav-notifications-menu .contactname {
|
#nav-notifications-menu .contactname {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
@ -947,6 +969,26 @@ ul.menu-popup .empty {
|
||||||
padding: 7px 7px 0px 0px;
|
padding: 7px 7px 0px 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* überlegung das zu löschen Ende*/
|
||||||
|
.notif-entry-wrapper {
|
||||||
|
padding: 5px;
|
||||||
|
min-height: 35px;
|
||||||
|
border-bottom: 1px solid #DDDDDD;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notif-photo-wrapper {
|
||||||
|
float: left;
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notif-photo-wrapper a {
|
||||||
|
padding: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notif-desc-wrapper {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
right_aside {
|
right_aside {
|
||||||
display: none;
|
display: none;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
|
|
|
@ -109,7 +109,15 @@
|
||||||
|
|
||||||
</nav>
|
</nav>
|
||||||
<ul id="nav-notifications-template" style="display:none;" rel="template">
|
<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>
|
</ul>
|
||||||
<!--
|
<!--
|
||||||
<div class="icon-flag" style="position: fixed; bottom: 10px; left: 20px; z-index:9;">{{$langselector}}</div>
|
<div class="icon-flag" style="position: fixed; bottom: 10px; left: 20px; z-index:9;">{{$langselector}}</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user