Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline: take out void setLabel() call in Mapstraction Updated max-width for profile and single notice page add username and timestamp to map popup
This commit is contained in:
commit
7a37b71a87
@ -33,7 +33,8 @@ $(document).ready(function() {
|
||||
mkr = new mxn.Marker(pt);
|
||||
|
||||
mkr.setIcon(n['user']['profile_image_url']);
|
||||
mkr.setInfoBubble(n['html']);
|
||||
mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] +
|
||||
'<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>');
|
||||
|
||||
mapstraction.addMarker(mkr);
|
||||
}
|
||||
|
@ -957,6 +957,7 @@ max-width:74%;
|
||||
#showstream .notice div.entry-content,
|
||||
#shownotice .notice div.entry-content {
|
||||
margin-left:0;
|
||||
max-width:82%;
|
||||
}
|
||||
|
||||
.notice .notice-options a,
|
||||
|
Loading…
Reference in New Issue
Block a user