From 83d7f19294fd5f56219383f65938a470eb49f274 Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Tue, 22 Oct 2013 22:31:12 +0200
Subject: [PATCH 1/6] added local_settings.py

---
 .gitignore       | 1 +
 cbmi/settings.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 99ec428..efc1dfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 .idea
+local_settings.py
diff --git a/cbmi/settings.py b/cbmi/settings.py
index 94a050a..f322292 100644
--- a/cbmi/settings.py
+++ b/cbmi/settings.py
@@ -199,3 +199,8 @@ LOGGING = {
         },
     }
 }
+
+try:
+    from local_settings import *
+except ImportError, e:
+    print 'Unable to load local_settings.py:', e

From afe60cadb9a32f98479bca4ae77a86ba0f93f94f Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Tue, 22 Oct 2013 22:32:22 +0200
Subject: [PATCH 2/6] added smiles local_settings.py

---
 cbmi/local_settings.py.smile | 57 ++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 cbmi/local_settings.py.smile

diff --git a/cbmi/local_settings.py.smile b/cbmi/local_settings.py.smile
new file mode 100644
index 0000000..1ea4e09
--- /dev/null
+++ b/cbmi/local_settings.py.smile
@@ -0,0 +1,57 @@
+# Django settings for cbmi project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    ('Brian Wiborg', 'baccenfutter@c-base.org')
+    # ('Your Name', 'your_email@example.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'cbmi.sqlite3',
+        'USER': '',
+        'PASSWORD': '',
+        'HOST': '',
+        'PORT': '',
+    }
+}
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = ''
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = ''
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+    # Put strings here, like "/home/html/static" or "C:/www/django/static".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+    '/home/smile/projects/cbmi/src/static',
+)
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+AUTH_LDAP_START_TLS = False

From 623d5131b7118b0bd85850ccb4334c12ab1333d2 Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Thu, 24 Oct 2013 21:28:17 +0200
Subject: [PATCH 3/6] moved c-base-bootstrap to its own directory and use
 submodule

---
 cbmi/templates/base.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cbmi/templates/base.html b/cbmi/templates/base.html
index ce4d198..4f30d80 100644
--- a/cbmi/templates/base.html
+++ b/cbmi/templates/base.html
@@ -13,8 +13,8 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <link href="/static/css/bootstrap.css" rel="stylesheet">
-    <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/static/c-base-bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="/static/c-base-bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
     <style>
         body {
             padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
@@ -81,9 +81,9 @@
         </div>
     </div>
 {% endblock body %}
-<script src="/static/js/bootstrap.js"></script>
+<script src="/static/c-base-bootstrap/js/bootstrap.js"></script>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-<script src="/static/js/bootstrap-transitions.js"></script>
-<script src="/static/js/bootstrap-dropdown.js"></script>
+<script src="/static/c-base-bootstrap/js/bootstrap-transitions.js"></script>
+<script src="/static/c-base-bootstrap/js/bootstrap-dropdown.js"></script>
 </body>
 </html>

From c4d3fb505bf93bdefe633578da9a58d271ade917 Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Thu, 24 Oct 2013 21:31:37 +0200
Subject: [PATCH 4/6] added .gitmodules

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5fc6723
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "static/c-base-bootstrap"]
+	path = static/c-base-bootstrap
+	url = git://dev.c-base.org/c-portal/c-portal-bootstrap.git

From 683b5bcdcf97fe16b6b003c07e4412c26b24aef0 Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Thu, 24 Oct 2013 21:32:52 +0200
Subject: [PATCH 5/6] added c-base-bootstrap

---
 static/c-base-bootstrap | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 static/c-base-bootstrap

diff --git a/static/c-base-bootstrap b/static/c-base-bootstrap
new file mode 160000
index 0000000..523293e
--- /dev/null
+++ b/static/c-base-bootstrap
@@ -0,0 +1 @@
+Subproject commit 523293e9d70d30956f4a8aa983b26dc93feb228a

From 0238970f5dc51b1871dfc781e0219aa63100c886 Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Fri, 25 Oct 2013 19:34:07 +0200
Subject: [PATCH 6/6] c-base-bootstrap added

---
 cbmi/templates/base.html | 2 +-
 static/c-base-bootstrap  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cbmi/templates/base.html b/cbmi/templates/base.html
index 0b8a608..e237b80 100644
--- a/cbmi/templates/base.html
+++ b/cbmi/templates/base.html
@@ -102,8 +102,8 @@
     {% endblock container %}
     </div><!-- /.container -->
 {% endblock body %}
-<script src="/static/c-base-bootstrap/js/bootstrap.js"></script>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
+<script src="/static/c-base-bootstrap/js/bootstrap.js"></script>
 <script src="/static/c-base-bootstrap/js/bootstrap-transitions.js"></script>
 <script src="/static/c-base-bootstrap/js/bootstrap-dropdown.js"></script>
 </body>
diff --git a/static/c-base-bootstrap b/static/c-base-bootstrap
index 523293e..279f25a 160000
--- a/static/c-base-bootstrap
+++ b/static/c-base-bootstrap
@@ -1 +1 @@
-Subproject commit 523293e9d70d30956f4a8aa983b26dc93feb228a
+Subproject commit 279f25a00dc1ee300009350a1ddc59963cef0da8