Commit 25d1b24f620fb22a96f2240e7effa993c159b9bc
1 parent
13e55b79
Exists in
master
and in
39 other branches
Minor changes on user profile - closes #88
Showing
1 changed file
with
14 additions
and
8 deletions
Show diff stats
src/accounts/templates/accounts/user_detail.html
| @@ -26,6 +26,18 @@ | @@ -26,6 +26,18 @@ | ||
| 26 | <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "group membership"|title %}</a> | 26 | <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "group membership"|title %}</a> |
| 27 | {% endif %} | 27 | {% endif %} |
| 28 | 28 | ||
| 29 | + {% if request.user.is_active %} | ||
| 30 | + {% if user_.bio %} | ||
| 31 | + <div class="divider"></div> | ||
| 32 | + <ul class="unstyled-list"> | ||
| 33 | + <li> | ||
| 34 | + <strong>{% trans 'Bio' %}</strong> | ||
| 35 | + </li> | ||
| 36 | + <li class="text-muted"> {{ user_.bio }}</li> | ||
| 37 | + </ul> | ||
| 38 | + {% endif %} | ||
| 39 | + {% endif %} | ||
| 40 | + | ||
| 29 | <div class="divider"></div> | 41 | <div class="divider"></div> |
| 30 | {% if request.user.is_active %} | 42 | {% if request.user.is_active %} |
| 31 | <ul class="unstyled-list"> | 43 | <ul class="unstyled-list"> |
| @@ -58,18 +70,12 @@ | @@ -58,18 +70,12 @@ | ||
| 58 | {% endif %} | 70 | {% endif %} |
| 59 | 71 | ||
| 60 | {% if user_.identi_ca %} | 72 | {% if user_.identi_ca %} |
| 61 | - <li><span class="icon-comments icon-fixed-width" title="{% trans 'Identi.ca account' %}"></span> {{ user_.identi_ca }}</li> | 73 | + <li><span class="icon-comments icon-fixed-width" title="{% trans 'Identi.ca account' %}"></span> <a target="_blank" href="https://identi.ca/{{ user_.identi_ca }}">{{ user_.identi_ca }}</a></li> |
| 62 | {% endif %} | 74 | {% endif %} |
| 63 | 75 | ||
| 64 | {% if user_.webpage %} | 76 | {% if user_.webpage %} |
| 65 | <li><span class="icon-link icon-fixed-width" title="{% trans 'Personal webpage' %}"></span> <a target="_blank" href="{{ user_.webpage }}" title="{% trans 'Personal webpage' %}">{{ user_.webpage }}</a></li> | 77 | <li><span class="icon-link icon-fixed-width" title="{% trans 'Personal webpage' %}"></span> <a target="_blank" href="{{ user_.webpage }}" title="{% trans 'Personal webpage' %}">{{ user_.webpage }}</a></li> |
| 66 | {% endif %} | 78 | {% endif %} |
| 67 | - {% if user_.bio %} | ||
| 68 | - <li class="divider"> | ||
| 69 | - <strong>{% trans 'Bio' %}</strong> | ||
| 70 | - </li> | ||
| 71 | - <li class="text-muted"> {{ user_.bio }}</li> | ||
| 72 | - {% endif %} | ||
| 73 | {% endif %} | 79 | {% endif %} |
| 74 | </ul> | 80 | </ul> |
| 75 | 81 | ||
| @@ -146,7 +152,7 @@ | @@ -146,7 +152,7 @@ | ||
| 146 | </div> | 152 | </div> |
| 147 | 153 | ||
| 148 | <div class="col-lg-6 col-md-6 col-sm-12"> | 154 | <div class="col-lg-6 col-md-6 col-sm-12"> |
| 149 | - <h3>{% trans "Other Collaborations" %}</h3> | 155 | + <h3>{% trans "Contributions" %}</h3> |
| 150 | <ul class="message-list"> | 156 | <ul class="message-list"> |
| 151 | {% for result in results %} | 157 | {% for result in results %} |
| 152 | {% include "message-preview.html" %} | 158 | {% include "message-preview.html" %} |