Download as
Browse Code »

Commit 383ab52e82a7248a26d9cd0c21ad85ec1028d7cd

Authored by Luan
2 parents 806a8fb0 e142883f
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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
  Diff comments   View file @383ab52
1 {% extends 'base.html' %} 1 {% extends 'base.html' %}
2 -{% load i18n %} 2 +{% load i18n gravatar %}
3 3
4 {% block main-content %} 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 <br> 8 <br>
7 9
8 <form method='post'> 10 <form method='post'>
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @383ab52
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 {% block main-content %} 9 {% block main-content %}
10 10
11 <div id="user-profile" class="row"> 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 <div class="thumbnail"> 13 <div class="thumbnail">
14 {% gravatar user_.email 200 %} 14 {% gravatar user_.email 200 %}
15 </div> 15 </div>
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <div class="divider"></div> 72 <div class="divider"></div>
73 </div> 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 <div class="panel panel-default"> 76 <div class="panel panel-default">
77 <div class="panel-heading"> 77 <div class="panel-heading">
78 <h3 class="panel-title">{% trans "Contributions by Area" %}</h3> 78 <h3 class="panel-title">{% trans "Contributions by Area" %}</h3>
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 </div> 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 <div class="panel panel-default"> 88 <div class="panel panel-default">
89 <div class="panel-heading"> 89 <div class="panel-heading">
90 <h3 class="panel-title">{% trans "Mailing list Participation" %}</h3> 90 <h3 class="panel-title">{% trans "Mailing list Participation" %}</h3>
src/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @383ab52
@@ -88,17 +88,23 @@ $(function() { @@ -88,17 +88,23 @@ $(function() {
88 88
89 89
90 {% block main-content %} 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 <form method="post"> 105 <form method="post">
92 {% csrf_token %} 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 <div class="row"> 108 <div class="row">
103 <div class="col-lg-8 col-md-7 col-sm-12 col-xm-12"> 109 <div class="col-lg-8 col-md-7 col-sm-12 col-xm-12">
104 {% for field in form %} 110 {% for field in form %}
src/accounts/utils/mailman.py
  Diff comments   View file @383ab52
@@ -34,7 +34,6 @@ def unsubscribe(listname, address): @@ -34,7 +34,6 @@ def unsubscribe(listname, address):
34 34
35 def update_subscription(address, lists): 35 def update_subscription(address, lists):
36 current_lists = address_lists(address) 36 current_lists = address_lists(address)
37 - print lists  
38 37
39 for maillist in current_lists: 38 for maillist in current_lists:
40 if maillist not in lists: 39 if maillist not in lists: