Merge branch 'master' into 48-new-homepage

Conflicts:
	templates/package.hamlet
This commit is contained in:
Michael Snoyman 2014-12-15 15:03:04 +02:00
commit 9abc609427
2 changed files with 8 additions and 3 deletions

View File

@ -35,7 +35,8 @@ $newline never
<span .likes>
<span #likes>
#{nLikes}
\ likes #
<span #like-or-likes>
\ #{format (plural "like" "likes") nLikes} #
<i .fa :liked:.fa-thumbs-up :not liked:.fa-thumbs-o-up #like title="#{likeTitle}">
<span .tags>
$if null tags

View File

@ -57,13 +57,17 @@ $(function(){
if (action == 'like') {
$this.attr('title','You liked this!');
$likes.text(nLikes + 1);
nLikes += 1;
$.post("@{PackageLikeR pn}");
} else {
$this.attr('title','You disliked this.');
$likes.text(nLikes - 1);
nLikes -= 1;
$.post("@{PackageUnlikeR pn}");
}
$likes.text(nLikes);
$('#like-or-likes').text(nLikes == 1 ? ' like ' : ' likes ');
} else {
login();
}