Commit 383ab52e82a7248a26d9cd0c21ad85ec1028d7cd
Exists in
master
and in
39 other branches
Merge branch 'master' of github.com:TracyWebTech/colab
Showing
4 changed files
with
20 additions
and
13 deletions
Show diff stats
src/accounts/templates/accounts/manage_subscriptions.html
| 1 | 1 | {% extends 'base.html' %} |
| 2 | -{% load i18n %} | |
| 2 | +{% load i18n gravatar %} | |
| 3 | 3 | |
| 4 | 4 | {% block main-content %} |
| 5 | 5 | |
| 6 | + <h2>{% blocktrans %}Mailing List Subscriptions{% endblocktrans %}</h2> | |
| 7 | + <h3>{% gravatar user_.email 50 %} {{ user_.get_full_name }} ({{ user_.username }})</h3> | |
| 6 | 8 | <br> |
| 7 | 9 | |
| 8 | 10 | <form method='post'> | ... | ... |
src/accounts/templates/accounts/user_detail.html
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | {% block main-content %} |
| 10 | 10 | |
| 11 | 11 | <div id="user-profile" class="row"> |
| 12 | - <div class="vcard col-lg-4 col-md-4 col-sm-4"> | |
| 12 | + <div class="vcard col-lg-4 col-md-4 col-sm-5"> | |
| 13 | 13 | <div class="thumbnail"> |
| 14 | 14 | {% gravatar user_.email 200 %} |
| 15 | 15 | </div> |
| ... | ... | @@ -72,7 +72,7 @@ |
| 72 | 72 | <div class="divider"></div> |
| 73 | 73 | </div> |
| 74 | 74 | |
| 75 | - <div class="col-lg-4 col-md-4 col-sm-8"> | |
| 75 | + <div class="col-lg-4 col-md-4 col-sm-7"> | |
| 76 | 76 | <div class="panel panel-default"> |
| 77 | 77 | <div class="panel-heading"> |
| 78 | 78 | <h3 class="panel-title">{% trans "Contributions by Area" %}</h3> |
| ... | ... | @@ -84,7 +84,7 @@ |
| 84 | 84 | </div> |
| 85 | 85 | |
| 86 | 86 | |
| 87 | - <div class="col-lg-4 col-md-4 col-sm-8 col-lg-offset-0 col-md-offset-0 col-sm-offset-4"> | |
| 87 | + <div class="col-lg-4 col-md-4 col-sm-7"> | |
| 88 | 88 | <div class="panel panel-default"> |
| 89 | 89 | <div class="panel-heading"> |
| 90 | 90 | <h3 class="panel-title">{% trans "Mailing list Participation" %}</h3> | ... | ... |
src/accounts/templates/accounts/user_update_form.html
| ... | ... | @@ -88,17 +88,23 @@ $(function() { |
| 88 | 88 | |
| 89 | 89 | |
| 90 | 90 | {% block main-content %} |
| 91 | + | |
| 92 | + <div class="col-lg-12"> | |
| 93 | + {% with user_.first_name as firstname %} | |
| 94 | + <h2>{% trans 'profile information'|title %}</h2> | |
| 95 | + {% endwith %} | |
| 96 | + | |
| 97 | + <h3>{% gravatar user_.email 50 %} {{ user_.get_full_name }} ({{ user_.username }})</h3> | |
| 98 | + <a href="https://gravatar.com" target="_blank"> | |
| 99 | + {% trans "Change your avatar at Gravatar.com" %} | |
| 100 | + </a> | |
| 101 | + </div> | |
| 102 | + <br> | |
| 103 | + <br> | |
| 104 | + | |
| 91 | 105 | <form method="post"> |
| 92 | 106 | {% csrf_token %} |
| 93 | 107 | |
| 94 | - <div class="col-lg-12"> | |
| 95 | - <a href="https://gravatar.com" target="_blank"> | |
| 96 | - {% gravatar user_.email 50 %} | |
| 97 | - {% trans "Change your avatar at Gravatar.com" %} | |
| 98 | - </a> | |
| 99 | - </div> | |
| 100 | - <br> | |
| 101 | - | |
| 102 | 108 | <div class="row"> |
| 103 | 109 | <div class="col-lg-8 col-md-7 col-sm-12 col-xm-12"> |
| 104 | 110 | {% for field in form %} | ... | ... |
src/accounts/utils/mailman.py