Skip to content
This repository was archived by the owner on Aug 13, 2019. It is now read-only.

Commit

Permalink
Merge branch '66-following-follow-uncentered' into 'master'
Browse files Browse the repository at this point in the history 
Resolve "Following/Follow uncentered"

Closes #66

See merge request TeamSPD/Chirp!62
  • Loading branch information
@divyamani1
divyamani1 committed Feb 17, 2018
2 parents 86e7761 + a3737be commit 0e9eff7
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions apps/user_profile/templates/user_profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ <h3 class="text-muted">No tweets yet :(</h3>
</div>

<div class="tab-pane justify-content-center text-center" id="follows">
<div class="row">
<div class="row justify-content-center">
<div class="col-md-6 justify-content-center">
<ul class="list-unstyled follows">
{% if profile_user.user_details.followed_by.all %}
{% for following_user in profile_user.user_details.followed_by.all %}
<li>
<div class="row">
<div class="col-md-2 d-flex justify-content-center">
<div class="row ">
<div class="col-md-2">
<a href="{% url 'user_profile:user_profile' following_user.user.username %}">
<img src="{% if following_user.user.user_details.profile_photo %}
{{ following_user.user.user_details.profile_photo.url }}
Expand All @@ -142,7 +142,7 @@ <h3 class="text-muted">No tweets yet :(</h3>
{% endif %}" alt="Circle Image" class="img-circle img-no-padding img-responsive">
</a>
</div>
<div class="col-md-7 d-flex justify-content-center">
<div class="col-md-7">
<a href="{% url 'user_profile:user_profile' following_user.user.username %}">
<h6>
{{following_user.user.first_name }} {{following_user.user.last_name }}
Expand All @@ -162,7 +162,17 @@ <h6>
{% endif %}
</div>
</div>
{% endif %}
{% else %}
<div class="unfollow" rel="tooltip" title="Unfollow">
<div class="following">
{% if user|check_followed_user_already:following_user.user %}
<a href="{% url 'user_profile:follow_user' username=following_user.user.username %}"><btn class="btn btn-sm btn-info btn-round" rel="tooltip" title="Follow"></i>Unfollow</btn></a>
{% else %}
<a href="{% url 'user_profile:follow_user' username=following_user.user.username %}"><btn class="btn btn-sm btn-info btn-round" rel="tooltip" title="Follow"><i class="fa fa-user-plus"></i>Follow</btn></a>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
</li>
Expand All @@ -176,7 +186,7 @@ <h3 class="text-muted">No one follows you yet :(</h3>
</div>
</div>
<div class="tab-pane text-center justify-content-center" id="following">
<div class="row">
<div class="row justify-content-center">
<div class="col-md-6 col-md-offset-3">
<ul class="list-unstyled follows">
{% if profile_user.user_details.follows.all %}
Expand Down

0 comments on commit 0e9eff7

Please sign in to comment.