Merge pull request #6 from TracyWebTech/configuration_variables

Configuration variables

Author: seocam

CHANGES.rst

@@ -2,6 +2,13 @@ Changelog
 =========
 
 
+0.3.0 (2013-12-06)
+------------
+
+- Adding CONVERSEJS_ALLOW_CONTACT_REQUESTS configuration variable. [LuanP]
+- Adding CONVERSEJS_SHOW_ONLY_ONLINE_USERS configuration variable. [LuanP]
+
+
 0.2.9 (2013-11-26)
 ------------
 

conversejs/conf.py

@@ -22,6 +22,8 @@ def get_conversejs_settings():
         'CONVERSEJS_SHOW_CONTROLBOX_BY_DEFAULT': False,
         'CONVERSEJS_XHR_USER_SEARCH': False,
         'CONVERSEJS_DEBUG': settings.DEBUG,
+        'CONVERSEJS_SHOW_ONLY_ONLINE_USERS': False,
+        'CONVERSEJS_ALLOW_CONTACT_REQUESTS': True,
     }
 
     for key, value in converse_settings.items():

conversejs/templates/conversejs/includes/initialize.html

@@ -12,6 +12,8 @@
                 show_controlbox_by_default: {{ CONVERSEJS_SHOW_CONTROLBOX_BY_DEFAULT }},
                 xhr_user_search: {{ CONVERSEJS_XHR_USER_SEARCH }},
                 bosh_service_url: '{{ CONVERSEJS_BOSH_SERVICE_URL }}',
+                show_only_online_users: '{{ CONVERSEJS_SHOW_ONLY_ONLINE_USERS }}',
+                allow_contact_requests: '{{ CONVERSEJS_ALLOW_CONTACT_REQUESTS }}',
                 jid: '{{ jid }}',
                 sid: '{{ sid }}',
                 rid: '{{ rid }}',

setup.py

@@ -19,7 +19,7 @@ def read(*parts):
 setup(
     name='django-conversejs',
     description='Adds converse.js (javascript XMPP client) to Django',
-    version='0.2.9',
+    version='0.3.0',
     long_description=read('README.rst'),
     packages=['conversejs',
               'conversejs.migrations',