amd/helvetica_simplicity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolving merge issues with the origin/master branch

Browse source
This commit is contained in:
Andrew Davidson 2009-09-11 09:27:55 +08:00
commit 886bec1a3f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
_activity_feed.php
View file

@ -93,6 +93,7 @@
<p class="title"><a href="<?php echo $item->get_original_permalink()?>"><?php echo $item->get_title()?></a></p> <p class="title"><a href="<?php echo $item->get_original_permalink()?>"><?php echo $item->get_title()?></a></p>
<img src="<?php echo $item->item_data['flickr_com']['image']['m']?>"> <img src="<?php echo $item->item_data['flickr_com']['image']['m']?>">
<div class="content"><?php echo $item->get_content()?></div> <div class="content"><?php echo $item->get_content()?></div>
@ -122,7 +123,7 @@
<div class="item"> <div class="item">
<p class="date"><?php echo $item->get_human_date()?></p> <p class="date"><?php echo $item->get_human_date()?></p>
<p class="source">I loved this track on last.fm</p> <p class="source">I loved this track on last.fm</p>
<div class="albumart"><a href="<?php echo $item->item_data['album_url']?>"><img height="64" width="64" src="<?php echo $item->item_data['image_url_small'] ?>" /></a></div> <div class="albumart"><a href="<?php echo $item->item_data['album_url']?>"><img style="width:64px;height:64px;" src="<?php echo $item->item_data['image_url_small'] ?>" /></a></div>
<div class="song_text"> <div class="song_text">
<a href="<?php echo $item->item_data['artist_url'] ?>"><?php echo $item->item_data['artist']?></a> - <a href="<?php echo $item->item_data['track_url']?>"><?php echo $item->item_data['track_title']?></a> <a href="<?php echo $item->item_data['artist_url'] ?>"><?php echo $item->item_data['artist']?></a> - <a href="<?php echo $item->item_data['track_url']?>"><?php echo $item->item_data['track_title']?></a>
</div> </div>