[Oi-commits] r1352 - in trunk: . forum

[oi-commits at pardus.org.tr]

Author: jnmbk
Date: Wed May  7 13:34:35 2008
New Revision: 1352

Modified:
   trunk/forum/models.py
   trunk/forum/settings.py
   trunk/forum/views.py
   trunk/settings.py
Log:
put settings in right place

Modified: trunk/forum/models.py
=================================================================
--- trunk/forum/models.py	(original)
+++ trunk/forum/models.py	Wed May  7 13:34:35 2008
@@ -13,7 +13,7 @@
 from oi.middleware import threadlocals
 from oi.st.models import Tag
 
-from oi.settings import FORUM_FROM_EMAIL
+from oi.forum.settings import FORUM_FROM_EMAIL
 
 import md5
 

Modified: trunk/forum/settings.py
=================================================================
--- trunk/forum/settings.py	(original)
+++ trunk/forum/settings.py	Wed May  7 13:34:35 2008
@@ -5,7 +5,14 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/copyleft/gpl.txt.
 
+# e-mail
+FORUM_FROM_EMAIL = 'forum at ozgurlukicin.com'
+FORUM_MESSAGE_LIST = 'forum at liste.ozgurlukicin.com'
+
+# paginator
 TOPICS_PER_PAGE = 20
 POSTS_PER_PAGE = 15
 ALL_POSTS_PER_PAGE = 10
+
+# misc
 FLOOD_TIMEOUT = 10

Modified: trunk/forum/views.py
=================================================================
--- trunk/forum/views.py	(original)
+++ trunk/forum/views.py	Wed May  7 13:34:35 2008
@@ -25,7 +25,7 @@
 
 # import our function for sending e-mails and setting
 from oi.st.wrappers import send_mail_with_header
-from oi.settings import FORUM_FROM_EMAIL, WEB_URL, FORUM_MESSAGE_LIST
+from oi.settings import WEB_URL
 
 # import bbcode renderer for quotation
 from oi.forum.postmarkup import render_bbcode

Modified: trunk/settings.py
=================================================================
--- trunk/settings.py	(original)
+++ trunk/settings.py	Wed May  7 13:34:35 2008
@@ -26,8 +26,6 @@
 
 # Email
 DEFAULT_FROM_EMAIL = 'noreply at ozgurlukicin.com'
-FORUM_FROM_EMAIL = 'forum at ozgurlukicin.com'
-FORUM_MESSAGE_LIST = 'forum at liste.ozgurlukicin.com'
 #EMAIL_USE_TLS = True
 
 # Pagination