- added settings_local import - added settings_local.py to .bzrignore

Fork: 0

kalle / postorius

Browse code - added settings_local import - added settings_local.py to .bzrignore - added list info master
1 parent 29fa49e commit 7d559c53eafaab9ce40a31ee4f5e3f884f97c54e Florian Fuchs authored on 13 Mar 2012

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View

■■■■■

.bzrignore

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          dev_setup/settings.py
 SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'socialauth_associate_complete'
SOCIAL_AUTH_DEFAULT_USERNAME = 'new_social_auth_user'
SOCIAL_AUTH_UUID_LENGTH = 16
 
try:
    from settings_local import *
except ImportError:
    pass
 SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'socialauth_associate_complete'
 SOCIAL_AUTH_DEFAULT_USERNAME = 'new_social_auth_user'
 SOCIAL_AUTH_UUID_LENGTH = 16
+try:
+    from settings_local import *
+except ImportError:
+    pass

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          src/mailmanweb/templates/mailmanweb/lists/summary.html
 {% block main %}
    {% if user.is_superuser %}
        {% include 'mailmanweb/menu/list_nav.html' %}
    {% endif %}
    <h1>{{list.settings.description}}</h1>
    <h1>{{list.real_name}}</h1>
 
    <!-- a href="{% url membership_settings fqdn_listname=list.fqdn_listname %}">{% trans "My Membership" %}</a -->
    <p><em>{{ list.settings.description }}</em></p>
 
    
    
    
 
{% endblock %}
 {% block main %}
     {% if user.is_superuser %}
         {% include 'mailmanweb/menu/list_nav.html' %}
     {% endif %}
+    <h1>{{list.settings.description}}</h1>
+    <h1>{{list.real_name}}</h1>
+    <!-- a href="{% url membership_settings fqdn_listname=list.fqdn_listname %}">{% trans "My Membership" %}</a -->
+    <p><em>{{ list.settings.description }}</em></p>
 {% endblock %}

Show line notes below