fixed error in template and removed ADMINS and DEBUG settings from settings.py

12 files changed, 15 insertions, 205 deletions

diff --git a/cnprog.wsgi b/cnprog.wsgi
index a3d332f2..14a62e0e 100644
--- a/cnprog.wsgi
+++ b/cnprog.wsgi
@@ -1,7 +1,7 @@
 import os
 import sys
-sys.path.append('/var/www/vhosts/default/htdocs')
-sys.path.append('/var/www/vhosts/default/htdocs/forum')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'forum.settings'
+sys.path.append('/path/above_forum')
+sys.path.append('/path/above_forum/forum_dir')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'forum_dir.settings'
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/junk.py b/junk.py
deleted file mode 100644
index c6c03d27..00000000
--- a/junk.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import os
-
-print os.path.normpath('/haha//haha')
diff --git a/session_messages/.svn/all-wcprops b/session_messages/.svn/all-wcprops
deleted file mode 100644
index 2a15b353..00000000
--- a/session_messages/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 38
-/svn/!svn/ver/5/trunk/session_messages
-END
-__init__.py
-K 25
-svn:wc:ra_dav:version-url
-V 50
-/svn/!svn/ver/5/trunk/session_messages/__init__.py
-END
-models.py
-K 25
-svn:wc:ra_dav:version-url
-V 48
-/svn/!svn/ver/2/trunk/session_messages/models.py
-END
-context_processors.py
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/!svn/ver/2/trunk/session_messages/context_processors.py
-END
diff --git a/session_messages/.svn/dir-prop-base b/session_messages/.svn/dir-prop-base
deleted file mode 100644
index 4cc643b7..00000000
--- a/session_messages/.svn/dir-prop-base
+++ /dev/null
@@ -1,6 +0,0 @@
-K 10
-svn:ignore
-V 6
-*.pyc
-
-END
diff --git a/session_messages/.svn/entries b/session_messages/.svn/entries
deleted file mode 100644
index 67c0db8a..00000000
--- a/session_messages/.svn/entries
+++ /dev/null
@@ -1,64 +0,0 @@
-8
-
-dir
-5
-http://django-session-messages.googlecode.com/svn/trunk/session_messages
-http://django-session-messages.googlecode.com/svn
-
-
-
-2009-03-10T23:30:03.043791Z
-5
-carl.j.meyer
-has-props
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-b8288d2d-7354-0410-af5b-714f73743f4b
-
-__init__.py
-file
-
-
-
-
-2009-10-25T23:36:02.000000Z
-89aa0f71c9973e4889e5fad0b4771a34
-2009-03-10T23:30:03.043791Z
-5
-carl.j.meyer
-
-models.py
-file
-
-
-
-
-2009-10-25T23:36:02.000000Z
-c5b4f274dbb06bc66a14f0c18c9115cd
-2008-08-14T23:13:23.180432Z
-2
-carl.j.meyer
-
-context_processors.py
-file
-
-
-
-
-2009-10-25T23:36:02.000000Z
-24779c7e504d3f7f1918fdf3fe8096bc
-2008-08-14T23:13:23.180432Z
-2
-carl.j.meyer
-
diff --git a/session_messages/.svn/format b/session_messages/.svn/format
deleted file mode 100644
index 45a4fb75..00000000
--- a/session_messages/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/session_messages/.svn/text-base/__init__.py.svn-base b/session_messages/.svn/text-base/__init__.py.svn-base
deleted file mode 100644
index 0136c888..00000000
--- a/session_messages/.svn/text-base/__init__.py.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Lightweight session-based messaging system.
-
-Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
-
-"""
-VERSION = (0, 1, 'pre')
-
-def create_message (request, message):
-    """
-    Create a message in the current session.
-
-    """
-    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
-    
-    try:
-        request.session['messages'].append(message)
-    except KeyError:
-        request.session['messages'] = [message]
-
-def get_and_delete_messages (request, include_auth=False):
-    """
-    Get and delete all messages for current session.
-
-    Optionally also fetches user messages from django.contrib.auth.
-
-    """
-    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
-
-    messages = request.session.pop('messages', [])
-
-    if include_auth and request.user.is_authenticated():
-        messages.extend(request.user.get_and_delete_messages())
-    
-    return messages
-
diff --git a/session_messages/.svn/text-base/context_processors.py.svn-base b/session_messages/.svn/text-base/context_processors.py.svn-base
deleted file mode 100644
index df9840fd..00000000
--- a/session_messages/.svn/text-base/context_processors.py.svn-base
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-Context processor for lightweight session messages.
-
-Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
-
-"""
-from django.utils.encoding import StrAndUnicode
-
-from session_messages import get_and_delete_messages
-
-def session_messages (request):
-    """
-    Returns session messages for the current session.
-
-    """
-    return { 'session_messages': LazyMessages(request) }
-
-class LazyMessages (StrAndUnicode):
-    """
-    Lazy message container, so messages aren't actually retrieved from
-    session and deleted until the template asks for them.
-
-    """
-    def __init__(self, request):
-        self.request = request
-
-    def __iter__(self):
-        return iter(self.messages)
-
-    def __len__(self):
-        return len(self.messages)
-
-    def __nonzero__(self):
-        return bool(self.messages)
-
-    def __unicode__(self):
-        return unicode(self.messages)
-
-    def __getitem__(self, *args, **kwargs):
-        return self.messages.__getitem__(*args, **kwargs)
-
-    def _get_messages(self):
-        if hasattr(self, '_messages'):
-            return self._messages
-        self._messages = get_and_delete_messages(self.request)
-        return self._messages
-    messages = property(_get_messages)
-    
diff --git a/session_messages/.svn/text-base/models.py.svn-base b/session_messages/.svn/text-base/models.py.svn-base
deleted file mode 100644
index b67ead6d..00000000
--- a/session_messages/.svn/text-base/models.py.svn-base
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-blank models.py
-"""
diff --git a/settings.py b/settings.py
index 3fc37dce..e964f092 100644
--- a/settings.py
+++ b/settings.py
@@ -2,18 +2,6 @@
 # Django settings for lanai project.
 import os.path
 import sys
-sys.path.insert(0,'/home/fadeev/incoming/Django-1.1.1')
-
-#DEBUG SETTINGS
-DEBUG = False 
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1','128.200.203.33')
-
-#EMAIL AND ADMINS
-ADMINS = (
-    ('Evgeny Fadeev', 'evgeny.fadeev@gmail.com'),
-)
-MANAGERS = ADMINS
 
 SITE_ID = 1
 
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 33402d35..8209a9fe 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -9,6 +9,15 @@ LOG_FILENAME = 'django.lanai.log'
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'team@cnprog.com'),)
+MANAGERS = ADMINS
+
+#DEBUG SETTINGS
+DEBUG = False 
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
 DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
diff --git a/templates/about.html b/templates/about.html
index 6d5f3060..671964cc 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -33,13 +33,10 @@
     points. These points are added to the users account when others vote for his/her questions or answers.
     These points (very) roughly reflect the level of trust of the community.{% endblocktrans %}
     </p>
-    <p>{% blocktrans %}No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url user_signin %}">join us!</a></strong>{% endblocktrans %}
+    <p>No points are necessary to ask or answer the questions - so please -
+    <strong><a href="{% url user_signin %}">join us!</a></strong>
     </p>
-    <p>
-        {% blocktrans %}
-            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
-        {% endblocktrans %}
+    <p>If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
     </p>
 </div>
 {% endblock %}