Merge pull request #38 from interlegis/upstream/master

Various changes

Author: seocam

README.rst

@@ -24,11 +24,11 @@ Application that integrates existing systems to represent the contributions of t
 Features
 ========
 
-* Developerd by Interlegis Communities http://colab.interlegis.leg.br/
+* Developed by Interlegis Communities http://colab.interlegis.leg.br/
 
-* Writed with Python http://python.org/
+* Written with Python http://python.org/
 
-* Build in Django Web Framework https://www.djangoproject.com/
+* Built in Django Web Framework https://www.djangoproject.com/
 
 * Search engine with Solr https://lucene.apache.org/solr/
 

src/accounts/templates/accounts/user_detail.html

@@ -8,8 +8,8 @@
   {% trans "Messages" as group_collabs %}
   {% trans "Contributions" as type_collabs %}
 
-  {% include "pizza-chart.html" with chart_data=type_count chart_div="collabs" chart_height=300 name=type_collabs %}
-  {% include "pizza-chart.html" with chart_data=list_activity chart_div="collabs2" chart_height=300 name=group_collabs %}
+  {% include "doughnut-chart.html" with chart_data=type_count chart_canvas="collabs" name=type_collabs %}
+  {% include "doughnut-chart.html" with chart_data=list_activity chart_canvas="collabs2" name=group_collabs %}
 {% endblock %}
 
 {% block main-content %}
@@ -97,10 +97,14 @@ <h1>
     <div class="col-lg-4 col-md-4 col-sm-7">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title">{% trans "Contributions by Type" %}</h3>
+          <h3 class="panel-title">{% trans "Collaborations by Type" %}</h3>
         </div>
         <div class="panel-body">
           <div id="collabs"></div>
+          <div class="chart collabs">
+              <canvas width="200" height="200"></canvas>
+            <p></p>
+          </div>
         </div>
       </div>
     </div>
@@ -112,7 +116,10 @@ <h3 class="panel-title">{% trans "Contributions by Type" %}</h3>
           <h3 class="panel-title">{% trans "Participation by Group" %}</h3>
         </div>
         <div class="panel-body">
-          <div id="collabs2"></div>
+          <div class="chart collabs2">
+              <canvas width="200" height="200"></canvas>
+            <p></p>
+          </div>
         </div>
       </div>
     </div>
@@ -150,13 +157,13 @@ <h3>{% trans "Latest posted" %} </h3>
       {% endfor %}
       </ul>
       <a href="{% url 'haystack_search' %}?type=thread&amp;author={{ user_.username }}">
-        {% trans "View more discussions..." %}
+        {% trans "View more posts..." %}
       </a>
       <div>&nbsp;</div>
     </div>
 
     <div class="col-lg-6 col-md-6 col-sm-12">
-      <h3>{% trans "Contributions" %}</h3>
+      <h3>{% trans "Latest contributions" %}</h3>
       <ul class="message-list">
       {% for result in results %}
         {% include "message-preview.html" %}

src/accounts/templates/accounts/user_update_form.html

@@ -190,7 +190,7 @@ <h3 class="panel-title">
         </div>
         <div class="panel-body">
           <div class="form-group">
-          {% trans "This feature is available only for who needs to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}
+          {% trans "This feature is available only for those who need to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}
           </div>
           <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
         </div>

src/accounts/utils/mailman.py

@@ -82,3 +82,16 @@ def get_list_description(listname, lists=None):
         lists = dict(lists)
 
     return lists.get(listname)
+
+
+def list_users(listname):
+    url = get_url(listname)
+
+    params = {}
+
+    try:
+        users = requests.get(url, timeout=TIMEOUT, params=params)
+    except requests.exceptions.RequestException:
+        return []
+
+    return users.json()

src/colab/custom_settings.py

@@ -306,6 +306,7 @@
 DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
 DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
 DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
+DPASTE_LEXER_DEFAULT = 'text'
 
 try:
     from local_settings import *