bleh

burke-software · Apr 5, 2012 · b0868f6 · b0868f6
1 parent 251dd76
commit b0868f6
Show file tree

Hide file tree

Showing 778 changed files with 146 additions and 1,012 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/ecwsp/__init__.py b/ecwsp/__init__.py
diff --git a/ecwsp/administration/__init__.py b/ecwsp/administration/__init__.py
diff --git a/ecwsp/administration/admin.py b/ecwsp/administration/admin.py
diff --git a/ecwsp/administration/forms.py b/ecwsp/administration/forms.py
diff --git a/ecwsp/administration/models.py b/ecwsp/administration/models.py
diff --git a/ecwsp/administration/tests.py b/ecwsp/administration/tests.py
diff --git a/ecwsp/administration/views.py b/ecwsp/administration/views.py
diff --git a/ecwsp/admissions/__init__.py b/ecwsp/admissions/__init__.py
diff --git a/ecwsp/admissions/admin.py b/ecwsp/admissions/admin.py
diff --git a/ecwsp/admissions/forms.py b/ecwsp/admissions/forms.py
diff --git a/ecwsp/admissions/models.py b/ecwsp/admissions/models.py
diff --git a/ecwsp/admissions/reports.py b/ecwsp/admissions/reports.py
diff --git a/ecwsp/admissions/templatetags/__init__.py b/ecwsp/admissions/templatetags/__init__.py
diff --git a/ecwsp/admissions/templatetags/admission_extras.py b/ecwsp/admissions/templatetags/admission_extras.py
diff --git a/ecwsp/admissions/urls.py b/ecwsp/admissions/urls.py
diff --git a/ecwsp/admissions/views.py b/ecwsp/admissions/views.py
diff --git a/ecwsp/alumni/__init__.py b/ecwsp/alumni/__init__.py
diff --git a/ecwsp/alumni/admin.py b/ecwsp/alumni/admin.py
diff --git a/ecwsp/alumni/forms.py b/ecwsp/alumni/forms.py
diff --git a/ecwsp/alumni/models.py b/ecwsp/alumni/models.py
diff --git a/ecwsp/alumni/tests.py b/ecwsp/alumni/tests.py
diff --git a/ecwsp/alumni/views.py b/ecwsp/alumni/views.py
diff --git a/ecwsp/appy/__init__.py b/ecwsp/appy/__init__.py
diff --git a/ecwsp/appy/pod/__init__.py b/ecwsp/appy/pod/__init__.py
diff --git a/ecwsp/appy/pod/actions.py b/ecwsp/appy/pod/actions.py
diff --git a/ecwsp/appy/pod/buffers.py b/ecwsp/appy/pod/buffers.py
diff --git a/ecwsp/appy/pod/converter.py b/ecwsp/appy/pod/converter.py
diff --git a/ecwsp/appy/pod/doc_importers.py b/ecwsp/appy/pod/doc_importers.py
diff --git a/ecwsp/appy/pod/elements.py b/ecwsp/appy/pod/elements.py
diff --git a/ecwsp/appy/pod/odf_parser.py b/ecwsp/appy/pod/odf_parser.py
diff --git a/ecwsp/appy/pod/parts.py b/ecwsp/appy/pod/parts.py
diff --git a/ecwsp/appy/pod/pod_parser.py b/ecwsp/appy/pod/pod_parser.py
diff --git a/ecwsp/appy/pod/renderer.py b/ecwsp/appy/pod/renderer.py
diff --git a/ecwsp/appy/pod/styles.in.content.xml b/ecwsp/appy/pod/styles.in.content.xml
diff --git a/ecwsp/appy/pod/styles.in.styles.xml b/ecwsp/appy/pod/styles.in.styles.xml
diff --git a/ecwsp/appy/pod/styles_manager.py b/ecwsp/appy/pod/styles_manager.py
diff --git a/ecwsp/appy/pod/xhtml2odt.py b/ecwsp/appy/pod/xhtml2odt.py
diff --git a/ecwsp/appy/shared/__init__.py b/ecwsp/appy/shared/__init__.py
diff --git a/ecwsp/appy/shared/csv_parser.py b/ecwsp/appy/shared/csv_parser.py
diff --git a/ecwsp/appy/shared/data/BelgianCommunes.txt b/ecwsp/appy/shared/data/BelgianCommunes.txt
diff --git a/ecwsp/appy/shared/data/CountryCodesIso3166.1.txt b/ecwsp/appy/shared/data/CountryCodesIso3166.1.txt
diff --git a/ecwsp/appy/shared/data/LanguageCodesIso639.2.txt b/ecwsp/appy/shared/data/LanguageCodesIso639.2.txt
diff --git a/ecwsp/appy/shared/data/__init__.py b/ecwsp/appy/shared/data/__init__.py
diff --git a/ecwsp/appy/shared/dav.py b/ecwsp/appy/shared/dav.py
diff --git a/ecwsp/appy/shared/diff.py b/ecwsp/appy/shared/diff.py
diff --git a/ecwsp/appy/shared/errors.py b/ecwsp/appy/shared/errors.py
diff --git a/ecwsp/appy/shared/odf.py b/ecwsp/appy/shared/odf.py
diff --git a/ecwsp/appy/shared/rtf.py b/ecwsp/appy/shared/rtf.py
diff --git a/ecwsp/appy/shared/sap.py b/ecwsp/appy/shared/sap.py
diff --git a/ecwsp/appy/shared/test.py b/ecwsp/appy/shared/test.py
diff --git a/ecwsp/appy/shared/utils.py b/ecwsp/appy/shared/utils.py
diff --git a/ecwsp/appy/shared/xml_parser.py b/ecwsp/appy/shared/xml_parser.py
diff --git a/ecwsp/appy/version.py b/ecwsp/appy/version.py
diff --git a/ecwsp/attendance/__init__.py b/ecwsp/attendance/__init__.py
diff --git a/ecwsp/attendance/admin.py b/ecwsp/attendance/admin.py
diff --git a/ecwsp/attendance/forms.py b/ecwsp/attendance/forms.py
diff --git a/ecwsp/attendance/lookups.py b/ecwsp/attendance/lookups.py
diff --git a/ecwsp/attendance/models.py b/ecwsp/attendance/models.py
diff --git a/ecwsp/attendance/templates/admin/attendance/studentattendance/change_list.html b/ecwsp/attendance/templates/admin/attendance/studentattendance/change_list.html
diff --git a/ecwsp/attendance/templates/attendance/attendance_report.html b/ecwsp/attendance/templates/attendance/attendance_report.html
diff --git a/ecwsp/attendance/templates/attendance/teacher_attendance.html b/ecwsp/attendance/templates/attendance/teacher_attendance.html
diff --git a/ecwsp/attendance/templates/attendance/teacher_attendance_which.html b/ecwsp/attendance/templates/attendance/teacher_attendance_which.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 
 {% block extrahead %}
-    <script type="text/javascript" src="/static/js/jquery.autocomplete.js"></script> 
-    <script type="text/javascript" src="/static/js/ajax_select.js"></script>
-    <link rel="stylesheet" type="text/css" href="/static/css/jquery.autocomplete.css" /> 
-    <link rel="stylesheet" type="text/css" href="/static/css/iconic.css" />
 
     {% load adminmedia %}
 	<script type="text/javascript" src="/admin/jsi18n/"></script>

diff --git a/ecwsp/attendance/templates/attendance/teacher_submissions.html b/ecwsp/attendance/templates/attendance/teacher_submissions.html
diff --git a/ecwsp/attendance/tests.py b/ecwsp/attendance/tests.py
diff --git a/ecwsp/attendance/urls.py b/ecwsp/attendance/urls.py
diff --git a/ecwsp/attendance/views.py b/ecwsp/attendance/views.py
diff --git a/ecwsp/benchmark_grade/__init__.py b/ecwsp/benchmark_grade/__init__.py
diff --git a/ecwsp/benchmark_grade/admin.py b/ecwsp/benchmark_grade/admin.py
diff --git a/ecwsp/benchmark_grade/forms.py b/ecwsp/benchmark_grade/forms.py
diff --git a/ecwsp/benchmark_grade/importer.py b/ecwsp/benchmark_grade/importer.py
diff --git a/ecwsp/benchmark_grade/models.py b/ecwsp/benchmark_grade/models.py
diff --git a/ecwsp/benchmark_grade/report.py b/ecwsp/benchmark_grade/report.py
diff --git a/ecwsp/benchmark_grade/urls.py b/ecwsp/benchmark_grade/urls.py
diff --git a/ecwsp/benchmark_grade/utility.py b/ecwsp/benchmark_grade/utility.py
diff --git a/ecwsp/benchmark_grade/views.py b/ecwsp/benchmark_grade/views.py
diff --git a/ecwsp/counseling/__init__.py b/ecwsp/counseling/__init__.py
diff --git a/ecwsp/counseling/admin.py b/ecwsp/counseling/admin.py
diff --git a/ecwsp/counseling/models.py b/ecwsp/counseling/models.py
diff --git a/ecwsp/counseling/tests.py b/ecwsp/counseling/tests.py
diff --git a/ecwsp/counseling/views.py b/ecwsp/counseling/views.py
diff --git a/ecwsp/dashboard.py b/ecwsp/dashboard.py
diff --git a/ecwsp/discipline/__init__.py b/ecwsp/discipline/__init__.py
diff --git a/ecwsp/discipline/admin.py b/ecwsp/discipline/admin.py
diff --git a/ecwsp/discipline/forms.py b/ecwsp/discipline/forms.py
diff --git a/ecwsp/discipline/lookups.py b/ecwsp/discipline/lookups.py
diff --git a/ecwsp/discipline/models.py b/ecwsp/discipline/models.py
diff --git a/ecwsp/discipline/templates/admin/discipline/studentdiscipline/change_list.html b/ecwsp/discipline/templates/admin/discipline/studentdiscipline/change_list.html
diff --git a/ecwsp/discipline/templates/discipline/disc_report.html b/ecwsp/discipline/templates/discipline/disc_report.html
@@ -3,9 +3,6 @@
 
 {% block extrahead %}
     <script type="text/javascript" src="/admin/jsi18n/"></script>
-	<script type="text/javascript" src="/static/grappelli/js/core.js"></script>
-    <script type="text/javascript" src="/static/grappelli/js/calendar.js"></script>    
-    <script type="text/javascript" src="/static/grappelli/js/admin/DateTimeShortcuts.js"></script>
     <script type="text/javascript" src="/static/js/time_actions.js"></script>
     <script type="text/javascript">
         $(document).ready(function() {

diff --git a/ecwsp/discipline/templates/discipline/enter_discipline.html b/ecwsp/discipline/templates/discipline/enter_discipline.html
@@ -1,46 +1,2 @@
-{% extends "admin/index.html" %}
-{% load i18n %}
 
-{% block extrahead %}
-    <script type="text/javascript" src="/static/js/jquery.autocomplete.js"></script> 
-    <script type="text/javascript" src="/static/js/ajax_select.js"></script>
-    <link rel="stylesheet" type="text/css" href="/static/css/jquery.autocomplete.css" /> 
-    <link rel="stylesheet" type="text/css" href="/static/css/iconic.css" />
-
-    {% load adminmedia %}
-	<script type="text/javascript" src="/admin/jsi18n/"></script>
-	<script type="text/javascript" src="/static/grappelli/js/core.js"></script>
-    {{ formset.media }}
-{% endblock %}
-
-{% block content %}
-	<h2> Add multiple discipline actions </h2>
-    <a href="{% url admin:sis_studentdiscipline_changelist %}">View all discipline actions</a>
-    <form method="post" action="" id="myform">
-       {{ formset.management_form }}
-       <div class='table'>
-            <table>
-                <tbody>
-                    <tr>
-                        <th>Date</th>
-                        <th>Student(s)</th>
-                        <th>Set Comments</th>
-                        <th>Other Comments</th>
-                    </tr>
-                    {% for form in formset.forms %}
-                    <tr>
-                        <td> {{ form.date }} </td>
-                        <td> {{ form.students }} </td>
-                        <td> {{ form.teacher }} </td>
-                        <td> {{ form.infraction }} </td>
-                        <td> {{ form.comments }} </td>
-                    </tr>
-                    {% endfor %} 
-                </tbody>
-            </table>
-        </div>
-        <input type="submit" value="Submit"/>   
-        <input type="submit" name="addmore" value="Submit and add more"/>        
-    </form>
-{% endblock %}
 
diff --git a/ecwsp/discipline/templates/discipline/generate_from_attendance.html b/ecwsp/discipline/templates/discipline/generate_from_attendance.html
diff --git a/ecwsp/discipline/templates/discipline/view_form.html b/ecwsp/discipline/templates/discipline/view_form.html
diff --git a/ecwsp/discipline/tests.py b/ecwsp/discipline/tests.py
diff --git a/ecwsp/discipline/urls.py b/ecwsp/discipline/urls.py
diff --git a/ecwsp/discipline/views.py b/ecwsp/discipline/views.py
diff --git a/ecwsp/django_cas/__init__.py b/ecwsp/django_cas/__init__.py
diff --git a/ecwsp/django_cas/backends.py b/ecwsp/django_cas/backends.py
diff --git a/ecwsp/django_cas/decorators.py b/ecwsp/django_cas/decorators.py
diff --git a/ecwsp/django_cas/middleware.py b/ecwsp/django_cas/middleware.py
diff --git a/ecwsp/django_cas/models.py b/ecwsp/django_cas/models.py
diff --git a/ecwsp/django_cas/views.py b/ecwsp/django_cas/views.py
diff --git a/ecwsp/engrade_sync/__init__.py b/ecwsp/engrade_sync/__init__.py
diff --git a/ecwsp/engrade_sync/admin.py b/ecwsp/engrade_sync/admin.py
diff --git a/ecwsp/engrade_sync/engrade_sync.py b/ecwsp/engrade_sync/engrade_sync.py
diff --git a/ecwsp/engrade_sync/forms.py b/ecwsp/engrade_sync/forms.py
diff --git a/ecwsp/engrade_sync/models.py b/ecwsp/engrade_sync/models.py
diff --git a/ecwsp/engrade_sync/python_engrade.py b/ecwsp/engrade_sync/python_engrade.py
diff --git a/ecwsp/engrade_sync/sync.py b/ecwsp/engrade_sync/sync.py
diff --git a/ecwsp/engrade_sync/urls.py b/ecwsp/engrade_sync/urls.py
diff --git a/ecwsp/engrade_sync/views.py b/ecwsp/engrade_sync/views.py
diff --git a/ecwsp/grades/__init__.py b/ecwsp/grades/__init__.py
diff --git a/ecwsp/grades/admin.py b/ecwsp/grades/admin.py
diff --git a/ecwsp/grades/forms.py b/ecwsp/grades/forms.py
diff --git a/ecwsp/grades/models.py b/ecwsp/grades/models.py
diff --git a/ecwsp/grades/templates/grades/student_gradesheet.html b/ecwsp/grades/templates/grades/student_gradesheet.html
diff --git a/ecwsp/grades/templates/grades/teacher_grade.html b/ecwsp/grades/templates/grades/teacher_grade.html
diff --git a/ecwsp/grades/templates/grades/teacher_grade_submissions.html b/ecwsp/grades/templates/grades/teacher_grade_submissions.html
diff --git a/ecwsp/grades/templates/grades/teacher_grade_upload.html b/ecwsp/grades/templates/grades/teacher_grade_upload.html
diff --git a/ecwsp/grades/tests.py b/ecwsp/grades/tests.py
diff --git a/ecwsp/grades/urls.py b/ecwsp/grades/urls.py
diff --git a/ecwsp/grades/views.py b/ecwsp/grades/views.py
diff --git a/ecwsp/manage.py b/ecwsp/manage.py
diff --git a/ecwsp/naviance_sso/__init__.py b/ecwsp/naviance_sso/__init__.py
diff --git a/ecwsp/naviance_sso/models.py b/ecwsp/naviance_sso/models.py
diff --git a/ecwsp/naviance_sso/tests.py b/ecwsp/naviance_sso/tests.py
diff --git a/ecwsp/naviance_sso/urls.py b/ecwsp/naviance_sso/urls.py
diff --git a/ecwsp/naviance_sso/views.py b/ecwsp/naviance_sso/views.py
diff --git a/ecwsp/omr/__init__.py b/ecwsp/omr/__init__.py
diff --git a/ecwsp/omr/admin.py b/ecwsp/omr/admin.py
diff --git a/ecwsp/omr/createpdf.py b/ecwsp/omr/createpdf.py
diff --git a/ecwsp/omr/forms.py b/ecwsp/omr/forms.py
diff --git a/ecwsp/omr/lookups.py b/ecwsp/omr/lookups.py
diff --git a/ecwsp/omr/management/__init__.py b/ecwsp/omr/management/__init__.py
diff --git a/ecwsp/omr/management/commands/__init__.py b/ecwsp/omr/management/commands/__init__.py
diff --git a/ecwsp/omr/management/commands/watch_quexf_folder.py b/ecwsp/omr/management/commands/watch_quexf_folder.py
diff --git a/ecwsp/omr/models.py b/ecwsp/omr/models.py
diff --git a/ecwsp/omr/orderedDict.py b/ecwsp/omr/orderedDict.py
diff --git a/ecwsp/omr/queXF.py b/ecwsp/omr/queXF.py
diff --git a/ecwsp/omr/reports.py b/ecwsp/omr/reports.py
diff --git a/ecwsp/omr/signals.py b/ecwsp/omr/signals.py
diff --git a/ecwsp/omr/tests.py b/ecwsp/omr/tests.py
diff --git a/ecwsp/omr/urls.py b/ecwsp/omr/urls.py
diff --git a/ecwsp/omr/views.py b/ecwsp/omr/views.py
diff --git a/ecwsp/schedule/__init__.py b/ecwsp/schedule/__init__.py
diff --git a/ecwsp/schedule/admin.py b/ecwsp/schedule/admin.py
diff --git a/ecwsp/schedule/calendar.py b/ecwsp/schedule/calendar.py
diff --git a/ecwsp/schedule/forms.py b/ecwsp/schedule/forms.py
diff --git a/ecwsp/schedule/lookups.py b/ecwsp/schedule/lookups.py
diff --git a/ecwsp/schedule/models.py b/ecwsp/schedule/models.py
diff --git a/ecwsp/schedule/tests.py b/ecwsp/schedule/tests.py
diff --git a/ecwsp/schedule/tests/schedule_testdata.serialized b/ecwsp/schedule/tests/schedule_testdata.serialized
diff --git a/ecwsp/schedule/tests/schedule_testmaker.py b/ecwsp/schedule/tests/schedule_testmaker.py
diff --git a/ecwsp/schedule/urls.py b/ecwsp/schedule/urls.py
diff --git a/ecwsp/schedule/views.py b/ecwsp/schedule/views.py
diff --git a/ecwsp/settings.py b/ecwsp/settings.py
@@ -19,44 +19,24 @@
 #       MA 02110-1301, USA.
 import os,sys, logging
 
-TEMPLATE_DIRS = os.path.join('/opt/sword/templates/')
-staticHead = os.path.dirname(os.path.abspath(''))
+# PATHS
+root_dir = '/opt/sword/'
+TEMPLATE_DIRS = root_dir + 'templates/'
 STATICFILES_DIRS = ((''),
-    '/opt/sword/static_files/',
+    root_dir + 'static_files/',
 )
-staticRootHead = os.path.dirname(os.path.abspath(''))
-STATIC_ROOT = os.path.join(staticRootHead, 'static/')
+STATIC_ROOT = root_dir + 'static/'
 STATIC_URL = '/static/'
+MEDIA_URL = '/media/'
+MEDIA_ROOT = root_dir + 'media/'
 
 
-LDAP = False
-if LDAP:
-    LDAP_SERVER = 'crnyhs-dc.admin.cristoreyny.org'
-    NT4_DOMAIN = 'ADMIN'
-    LDAP_PORT = 389
-    LDAP_URL = 'ldap://%s:%s' % (LDAP_SERVER, LDAP_PORT)
-    SEARCH_DN = 'DC=admin,DC=cristoreyny,DC=org'
-    SEARCH_FIELDS = ['mail','givenName','sn','sAMAccountName','memberOf', 'cn']
-    BIND_USER = 'ldap'
-    BIND_PASSWORD = ''
-
-# Single Sign On
-CAS = False
-if CAS:
-    CAS_SERVER_URL = "https://cas.cristoreyny.org:443/cas/"
-    AUTHENTICATION_BACKENDS = ('ldap_groups.accounts.backends.ActiveDirectoryGroupMembershipSSLBackend','django.contrib.auth.backends.ModelBackend','django_cas.backends.CASBackend',)
-elif LDAP:
-    AUTHENTICATION_BACKENDS = ('ldap_groups.accounts.backends.ActiveDirectoryGroupMembershipSSLBackend','django.contrib.auth.backends.ModelBackend',)
-else:
-    AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
-
+# Django stuff
 LOGIN_REDIRECT_URL = "/"
-
-# admins get emailed if there is an error
 ADMINS = (
     ('Admin', 'someone@example.com'),
 )
-
+MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
@@ -65,70 +45,31 @@
         'PASSWORD': '1234',
     }
 }
-
-# This section should not normally be edited
-MANAGERS = ADMINS
-
-# SMTP server
 EMAIL_HOST = 'daphne.cristoreyny.org'
-
-# Max number of hours a student can work per day.
-MAX_HOURS_DAY = 10
-
-# Sync data to SugarCRM
-SYNC_SUGAR = False
-
 # Prefered file format, may be changed in user preferences.
 # Default o
 # o = Open Document
 # m = Microsoft Binary
 # x = Microsoft XML
 PREFERED_FORMAT = 'o'
-
 TIME_ZONE = 'America/New_York'
 TIME_INPUT_FORMATS = ('%I:%M %p', '%I:%M%p', '%H:%M:%S', '%H:%M')
 TIME_FORMAT = 'h:i A'
 DATE_INPUT_FORMATS = ('%m/%d/%Y', '%Y-%m-%d', '%m/%d/%y', '%b %d %Y',
 '%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y',
 '%B %d, %Y', '%d %B %Y', '%d %B, %Y')
 #USE_L10N = True
-
-# Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
-
 SITE_ID = 1
 INTERNAL_IPS = ('127.0.0.1',)
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
 USE_I18N = True
-
-# base URL
-# Example: "www.example.com"
-production = False
-if production:
-    BASE_URL = "http://sis.cristoreyny.org"
-else:
-    BASE_URL = "http://127.0.0.1:8000"
-
-MEDIA_URL = '/media/'
-mediaHead = os.path.dirname(os.path.abspath(''))
-MEDIA_ROOT = os.path.join(mediaHead, 'media/')
-
-ADMIN_MEDIA_PREFIX = STATIC_URL + "grappelli/"
-
-# Make this unique, and don't share it with anybody.
 SECRET_KEY = '4@=mqjpx*f$3m(1-wl6&02p#cx@*dz4_t26lu@@pmd^2%+)**y'
-
-# List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#    'django.template.loaders.eggs.load_template_source',
 )
-
 ROOT_URLCONF = 'ecwsp.urls'
-
 INSTALLED_APPS = (
     'grappelli.dashboard',
     'grappelli',
@@ -139,7 +80,6 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.webdesign',
-
     'ecwsp.volunteer_track',
     'ecwsp.sis',
     'ecwsp.schedule',
@@ -153,8 +93,7 @@
     'ecwsp.attendance',
     'ecwsp.grades',
     'ecwsp.counseling',
-    'ecwsp.naviance_sso',
-
+    #'ecwsp.naviance_sso',
     'ajax_select',
     'reversion',
     'django_extensions',
@@ -163,47 +102,77 @@
     'massadmin',
     'admin_export',
     'custom_field',
-
     #'google_auth',
     #'ldap_groups',
 )
-
-# Google Apps Settings
-GAPPS = False
-if GAPPS:
-    GAPPS_DOMAIN = ''
-    GAPPS_USERNAME = ''
-    GAPPS_PASSWORD = ''
-    GAPPS_ALWAY_ADD_GROUPS = False
-    AUTHENTICATION_BACKENDS += ('ecwsp.google_auth.backends.GoogleAppsBackend',)
-
-MIDDLEWARE_CLASSES = ()
-MIDDLEWARE_CLASSES += (
+MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'pagination.middleware.PaginationMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
     )
-if CAS:
-    MIDDLEWARE_CLASSES += (
-        'django_cas.middleware.CASMiddleware',
-        'django.middleware.doc.XViewMiddleware',
-        )
-
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",
     "django.core.context_processors.request",
     "django.core.context_processors.i18n",
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.debug',
     'django.core.context_processors.media',
-
     'ecwsp.sis.context_processors.global_stuff',
 )
+DEBUG = True
+TEMPLATE_DEBUG = True
+AUTH_PROFILE_MODULE = 'sis.UserPreference'
+
+
+#GRAPPELLI
+ADMIN_TOOLS_MENU = 'ecwsp.menu.CustomMenu'
+ADMIN_MEDIA_PREFIX = STATIC_URL + "grappelli/"
+GRAPPELLI_INDEX_DASHBOARD = 'ecwsp.dashboard.CustomIndexDashboard'
+GRAPPELLI_ADMIN_TITLE = '<img src="/static/images/logo.png"/ style="height: 30px; margin-left: -10px; margin-top: -8px; margin-bottom: -11px;">'
+
+
+#LDAP
+LDAP = False
+if LDAP:
+    LDAP_SERVER = 'crnyhs-dc.admin.cristoreyny.org'
+    NT4_DOMAIN = 'ADMIN'
+    LDAP_PORT = 389
+    LDAP_URL = 'ldap://%s:%s' % (LDAP_SERVER, LDAP_PORT)
+    SEARCH_DN = 'DC=admin,DC=cristoreyny,DC=org'
+    SEARCH_FIELDS = ['mail','givenName','sn','sAMAccountName','memberOf', 'cn']
+    BIND_USER = 'ldap'
+    BIND_PASSWORD = ''
 
 
+#CAS
+CAS = False
+if CAS:
+    CAS_SERVER_URL = ""
+    AUTHENTICATION_BACKENDS = ('ldap_groups.accounts.backends.ActiveDirectoryGroupMembershipSSLBackend','django.contrib.auth.backends.ModelBackend','django_cas.backends.CASBackend',)
+    MIDDLEWARE_CLASSES += (
+        'django_cas.middleware.CASMiddleware',
+        'django.middleware.doc.XViewMiddleware',
+        )
+elif LDAP:
+    AUTHENTICATION_BACKENDS = ('ldap_groups.accounts.backends.ActiveDirectoryGroupMembershipSSLBackend','django.contrib.auth.backends.ModelBackend',)
+else:
+    AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
+
+
+#Google Apps
+GAPPS = False
+if GAPPS:
+    GAPPS_DOMAIN = ''
+    GAPPS_USERNAME = ''
+    GAPPS_PASSWORD = ''
+    GAPPS_ALWAY_ADD_GROUPS = False
+    AUTHENTICATION_BACKENDS += ('ecwsp.google_auth.backends.GoogleAppsBackend',)
+
+
+#Django AJAX selects
 AJAX_LOOKUP_CHANNELS = {
     # the simplest case, pass a DICT with the model and field to search against :
     'student' : ('ecwsp.sis.lookups', 'StudentLookup'),
@@ -225,24 +194,15 @@
     'course': {'model':'schedule.course', 'search_field':'fullname'},
     'day': ('ecwsp.schedule.lookups','DayLookup'),
 }
-AJAX_SELECT_BOOTSTRAP = False
-AJAX_SELECT_INLINES = 'staticfiles'
-
 if 'ecwsp.omr' in INSTALLED_APPS:
     AJAX_LOOKUP_CHANNELS['benchmark'] = ('ecwsp.omr.lookups', 'BenchmarkLookup')
+AJAX_SELECT_BOOTSTRAP = False
+AJAX_SELECT_INLINES = 'staticfiles'
 
-DEBUG = True
-TEMPLATE_DEBUG = True
-
-AUTH_PROFILE_MODULE = 'sis.UserPreference'
-
-ADMIN_TOOLS_MENU = 'ecwsp.menu.CustomMenu'
-GRAPPELLI_INDEX_DASHBOARD = 'ecwsp.dashboard.CustomIndexDashboard'
-GRAPPELLI_ADMIN_TITLE = '<img src="/static/images/logo.png"/ style="height: 30px; margin-left: -10px; margin-top: -8px; margin-bottom: -11px;">'
 
+#CKEDITOR
 CKEDITOR_MEDIA_PREFIX = "/static/ckeditor/"
 CKEDITOR_UPLOAD_PATH = MEDIA_ROOT + "uploads"
-
 CKEDITOR_CONFIGS = {
     'default': {
         'toolbar': [
@@ -264,12 +224,6 @@
     },
 }
 
-#CACHES = {
-#    'default': {
-#        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-#        'LOCATION': '127.0.0.1:11211',
-#    }
-#}
 
 LOGGING = {
     'version': 1,
@@ -314,33 +268,33 @@
 }
 
 
-
+#Engrade
 # http://ww7.engrade.com/api/key.php
 ENGRADE_APIKEY = ''
-# Admin user login
 ENGRADE_LOGIN = ''
-# Engrade password
 ENGRADE_PASSWORD = ''
 # School UID (admin must be connected to school)
 ENGRADE_SCHOOLID = ''
 
 
+#Naviance
 NAVIANCE_USERNAME=''
 NAVIANCE_PASSWORD=''
 # username, id, or unique_id
 NAVIANCE_SWORD_ID='username'
 
 
+#Admissions
 ADMISSIONS_DEFAULT_COUNTRY = "United States"
 
-# URL of master server that stores questions
-OMR_MASTER_SERVER='localhost'
-# If this instance the master server?
-OMR_IS_MASTER_SERVER=True
 
-SENTRY_MAIL_LEVEL = logging.WARNING
+#Work Study
+MAX_HOURS_DAY = 10
+# Sync data to SugarCRM
+SYNC_SUGAR = False
+
 
-# The "new" url path for quexf.
+#OMR
 QUEXF_URL = "http://quexf.cristoreyny.org"
 
 # this will load additional settings from the file settings_local.py

diff --git a/ecwsp/sis/__init__.py b/ecwsp/sis/__init__.py
diff --git a/ecwsp/sis/admin.py b/ecwsp/sis/admin.py
diff --git a/ecwsp/sis/context_processors.py b/ecwsp/sis/context_processors.py
diff --git a/ecwsp/sis/forms.py b/ecwsp/sis/forms.py
diff --git a/ecwsp/sis/helper_functions.py b/ecwsp/sis/helper_functions.py
diff --git a/ecwsp/sis/importer.py b/ecwsp/sis/importer.py
diff --git a/ecwsp/sis/lookups.py b/ecwsp/sis/lookups.py
diff --git a/ecwsp/sis/management/__init__.py b/ecwsp/sis/management/__init__.py
diff --git a/ecwsp/sis/management/commands/__init__.py b/ecwsp/sis/management/commands/__init__.py
diff --git a/ecwsp/sis/management/commands/add_user.py b/ecwsp/sis/management/commands/add_user.py
diff --git a/ecwsp/sis/management/commands/daily.py b/ecwsp/sis/management/commands/daily.py
diff --git a/ecwsp/sis/models.py b/ecwsp/sis/models.py
diff --git a/ecwsp/sis/report.py b/ecwsp/sis/report.py
diff --git a/ecwsp/sis/sql/cohort.sql b/ecwsp/sis/sql/cohort.sql
diff --git a/ecwsp/sis/templatetags/__init__.py b/ecwsp/sis/templatetags/__init__.py
diff --git a/ecwsp/sis/templatetags/sis_extras.py b/ecwsp/sis/templatetags/sis_extras.py
diff --git a/ecwsp/sis/templatetags/tags.py b/ecwsp/sis/templatetags/tags.py
diff --git a/ecwsp/sis/tests.py b/ecwsp/sis/tests.py
diff --git a/ecwsp/sis/thumbs.py b/ecwsp/sis/thumbs.py
diff --git a/ecwsp/sis/uno_report.py b/ecwsp/sis/uno_report.py
diff --git a/ecwsp/sis/urls.py b/ecwsp/sis/urls.py
diff --git a/ecwsp/sis/views.py b/ecwsp/sis/views.py
diff --git a/ecwsp/sis/xlsReport.py b/ecwsp/sis/xlsReport.py
diff --git a/ecwsp/urls.py b/ecwsp/urls.py
diff --git a/ecwsp/volunteer_track/__init__.py b/ecwsp/volunteer_track/__init__.py
diff --git a/ecwsp/volunteer_track/admin.py b/ecwsp/volunteer_track/admin.py