wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Browse Source 
* '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:
Zach Copley 2009-11-19 11:56:00 -08:00
commit 7a37b71a87
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Mapstraction/usermap.js
View File

@ -33,7 +33,8 @@ $(document).ready(function() {
mkr = new mxn.Marker(pt); mkr = new mxn.Marker(pt);
mkr.setIcon(n['user']['profile_image_url']); 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); mapstraction.addMarker(mkr);
} }

1
theme/base/css/display.css
View File

@ -957,6 +957,7 @@ max-width:74%;
#showstream .notice div.entry-content, #showstream .notice div.entry-content,
#shownotice .notice div.entry-content { #shownotice .notice div.entry-content {
margin-left:0; margin-left:0;
max-width:82%;
} }
.notice .notice-options a, .notice .notice-options a,