Merge branch 'master' of github.com:SachaG/Telescope

This commit is contained in:
Sacha Greif 2012-12-05 11:37:23 +09:00
commit 3f9955bdb3
3 changed files with 6 additions and 4 deletions

View file

@ -21,6 +21,8 @@ Telescope is an open-source, real-time social news site built with [Meteor](http
# Installation
- Install Meteor
- Install [Meteorite](https://github.com/oortcloud/meteorite/)
- Download or clone Telescope into /some/path
- cd /some/path
- Run `mrt`
# Running Telescope on Heroku

View file

@ -138,10 +138,7 @@ Template.comment_item.rendered=function(){
var user=Meteor.users.findOne(comment.userId);
var author=getDisplayName(user);
var imgURL=Gravatar.getGravatar(user, {
d: 'http://telesc.pe/img/default_avatar.png',
s: 30
});
var imgURL=getAvatarUrl(user);
var $container=findQueueContainer($comment);
var comment_link='<li class="icon-user"><a href="#'+comment._id+'" class="has-tooltip" style="background-image:url('+imgURL+')"><span class="tooltip"><span>'+author+'</span></span></a></li>';
if(this.firstRender){

View file

@ -10,6 +10,9 @@
<li><a class="settings" href="/settings">Settings</a></li>
<li><a class="admin" href="/admin">Admin</a></li>
{{/if}}
{{#if canView}}
<li><a href="/submit">Post</a></li>
{{/if}}
</ul>
</div>
</div>