diff options
| author | Zach Copley <zach@status.net> | 2009-11-19 11:56:00 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-19 11:56:00 -0800 |
| commit | 7a37b71a87c3923d867d5443c88dc10ab9c121a7 (patch) | |
| tree | 9ffaf3beef5d0075d49ab07db80449b0faac4ec4 | |
| parent | b8de14af2c91eb50b62e352a5a66ee3ee474d7a0 (diff) | |
| parent | 507c7e1e6b2772ec1c138378cc6ca3c3e3f8df9c (diff) | |
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
| -rw-r--r-- | plugins/Mapstraction/usermap.js | 3 | ||||
| -rw-r--r-- | theme/base/css/display.css | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index 41bdb677b..270b7efea 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -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); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d5917953f..e584fae43 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -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, |