Merge branch 'master' of github.com:fergalmoran/dss

This commit is contained in:
fergalmoran
2013-03-12 13:58:42 +00:00
2 changed files with 10 additions and 0 deletions

View File

@@ -0,0 +1,9 @@
from django.db import models
from spa.models.UserProfile import UserProfile
from spa.models._BaseModel import _BaseModel
class UserFollows(_BaseModel):
user_from = models.OneToOneField(UserProfile)
user_to = models.OneToOneField(UserProfile)

View File

@@ -6,6 +6,7 @@
</div>
<div class="mix-profile-insert">
<h6><a href="<%= item.user_profile_url %>"><i class="icon-user"></i><%= item.user_name %></a></h6>
<h6><a href="<%= item.user_profile_url %>"><i class="icon-headphones"></i><%= item.user_name %></a></h6>
</div>
</div>
<div class="span10" style="padding-left: 32px">