main app moved from apps/forum to djangobb_forum. Warning: you must renaming DB tables prefix!

--HG--
rename : djangobb/apps/forum/__init__.py => djangobb/djangobb_forum/__init__.py
rename : djangobb/apps/forum/admin.py => djangobb/djangobb_forum/admin.py
rename : djangobb/apps/forum/context_processors.py => djangobb/djangobb_forum/context_processors.py
rename : djangobb/apps/forum/feeds.py => djangobb/djangobb_forum/feeds.py
rename : djangobb/apps/forum/fields.py => djangobb/djangobb_forum/fields.py
rename : djangobb/apps/forum/forms.py => djangobb/djangobb_forum/forms.py
rename : djangobb/apps/forum/index.py => djangobb/djangobb_forum/index.py
rename : djangobb/apps/forum/locale/ru/LC_MESSAGES/django.mo => djangobb/djangobb_forum/locale/ru/LC_MESSAGES/django.mo
rename : djangobb/apps/forum/locale/ru/LC_MESSAGES/django.po => djangobb/djangobb_forum/locale/ru/LC_MESSAGES/django.po
rename : djangobb/apps/forum/locale/zh_CN/LC_MESSAGES/django.mo => djangobb/djangobb_forum/locale/zh_CN/LC_MESSAGES/django.mo
rename : djangobb/apps/forum/locale/zh_CN/LC_MESSAGES/django.po => djangobb/djangobb_forum/locale/zh_CN/LC_MESSAGES/django.po
rename : djangobb/apps/forum/management/__init__.py => djangobb/djangobb_forum/management/__init__.py
rename : djangobb/apps/forum/management/commands/__init__.py => djangobb/djangobb_forum/management/commands/__init__.py
rename : djangobb/apps/forum/management/commands/unban.py => djangobb/djangobb_forum/management/commands/unban.py
rename : djangobb/apps/forum/markups/__init__.py => djangobb/djangobb_forum/markups/__init__.py
rename : djangobb/apps/forum/markups/mypostmarkup.py => djangobb/djangobb_forum/markups/mypostmarkup.py
rename : djangobb/apps/forum/markups/postmarkup.py => djangobb/djangobb_forum/markups/postmarkup.py
rename : djangobb/apps/forum/middleware.py => djangobb/djangobb_forum/middleware.py
rename : djangobb/apps/forum/models.py => djangobb/djangobb_forum/models.py
rename : djangobb/apps/forum/settings.py => djangobb/djangobb_forum/settings.py
rename : djangobb/apps/forum/signals.py => djangobb/djangobb_forum/signals.py
rename : djangobb/apps/forum/subscription.py => djangobb/djangobb_forum/subscription.py
rename : djangobb/apps/forum/templates/forum/add_post.html => djangobb/djangobb_forum/templates/forum/add_post.html
rename : djangobb/apps/forum/templates/forum/base.html => djangobb/djangobb_forum/templates/forum/base.html
rename : djangobb/apps/forum/templates/forum/delete_posts.html => djangobb/djangobb_forum/templates/forum/delete_posts.html
rename : djangobb/apps/forum/templates/forum/edit_post.html => djangobb/djangobb_forum/templates/forum/edit_post.html
rename : djangobb/apps/forum/templates/forum/feeds/posts_description.html => djangobb/djangobb_forum/templates/forum/feeds/posts_description.html
rename : djangobb/apps/forum/templates/forum/feeds/posts_title.html => djangobb/djangobb_forum/templates/forum/feeds/posts_title.html
rename : djangobb/apps/forum/templates/forum/feeds/topics_description.html => djangobb/djangobb_forum/templates/forum/feeds/topics_description.html
rename : djangobb/apps/forum/templates/forum/feeds/topics_title.html => djangobb/djangobb_forum/templates/forum/feeds/topics_title.html
rename : djangobb/apps/forum/templates/forum/forum.html => djangobb/djangobb_forum/templates/forum/forum.html
rename : djangobb/apps/forum/templates/forum/forum_row.html => djangobb/djangobb_forum/templates/forum/forum_row.html
rename : djangobb/apps/forum/templates/forum/header.html => djangobb/djangobb_forum/templates/forum/header.html
rename : djangobb/apps/forum/templates/forum/index.html => djangobb/djangobb_forum/templates/forum/index.html
rename : djangobb/apps/forum/templates/forum/lofi/base.html => djangobb/djangobb_forum/templates/forum/lofi/base.html
rename : djangobb/apps/forum/templates/forum/lofi/footer.html => djangobb/djangobb_forum/templates/forum/lofi/footer.html
rename : djangobb/apps/forum/templates/forum/lofi/forum.html => djangobb/djangobb_forum/templates/forum/lofi/forum.html
rename : djangobb/apps/forum/templates/forum/lofi/header.html => djangobb/djangobb_forum/templates/forum/lofi/header.html
rename : djangobb/apps/forum/templates/forum/lofi/index.html => djangobb/djangobb_forum/templates/forum/lofi/index.html
rename : djangobb/apps/forum/templates/forum/lofi/pagination.html => djangobb/djangobb_forum/templates/forum/lofi/pagination.html
rename : djangobb/apps/forum/templates/forum/lofi/topic.html => djangobb/djangobb_forum/templates/forum/lofi/topic.html
rename : djangobb/apps/forum/templates/forum/mail_to.html => djangobb/djangobb_forum/templates/forum/mail_to.html
rename : djangobb/apps/forum/templates/forum/moderate.html => djangobb/djangobb_forum/templates/forum/moderate.html
rename : djangobb/apps/forum/templates/forum/moderators.html => djangobb/djangobb_forum/templates/forum/moderators.html
rename : djangobb/apps/forum/templates/forum/move_topic.html => djangobb/djangobb_forum/templates/forum/move_topic.html
rename : djangobb/apps/forum/templates/forum/pagination.html => djangobb/djangobb_forum/templates/forum/pagination.html
rename : djangobb/apps/forum/templates/forum/pm/base_pm.html => djangobb/djangobb_forum/templates/forum/pm/base_pm.html
rename : djangobb/apps/forum/templates/forum/pm/create_pm.html => djangobb/djangobb_forum/templates/forum/pm/create_pm.html
rename : djangobb/apps/forum/templates/forum/pm/inbox.html => djangobb/djangobb_forum/templates/forum/pm/inbox.html
rename : djangobb/apps/forum/templates/forum/pm/menu_pm.html => djangobb/djangobb_forum/templates/forum/pm/menu_pm.html
rename : djangobb/apps/forum/templates/forum/pm/message.html => djangobb/djangobb_forum/templates/forum/pm/message.html
rename : djangobb/apps/forum/templates/forum/pm/outbox.html => djangobb/djangobb_forum/templates/forum/pm/outbox.html
rename : djangobb/apps/forum/templates/forum/post_preview.html => djangobb/djangobb_forum/templates/forum/post_preview.html
rename : djangobb/apps/forum/templates/forum/profile/profile_admin.html => djangobb/djangobb_forum/templates/forum/profile/profile_admin.html
rename : djangobb/apps/forum/templates/forum/profile/profile_display.html => djangobb/djangobb_forum/templates/forum/profile/profile_display.html
rename : djangobb/apps/forum/templates/forum/profile/profile_essentials.html => djangobb/djangobb_forum/templates/forum/profile/profile_essentials.html
rename : djangobb/apps/forum/templates/forum/profile/profile_menu.html => djangobb/djangobb_forum/templates/forum/profile/profile_menu.html
rename : djangobb/apps/forum/templates/forum/profile/profile_messaging.html => djangobb/djangobb_forum/templates/forum/profile/profile_messaging.html
rename : djangobb/apps/forum/templates/forum/profile/profile_personal.html => djangobb/djangobb_forum/templates/forum/profile/profile_personal.html
rename : djangobb/apps/forum/templates/forum/profile/profile_personality.html => djangobb/djangobb_forum/templates/forum/profile/profile_personality.html
rename : djangobb/apps/forum/templates/forum/profile/profile_privacy.html => djangobb/djangobb_forum/templates/forum/profile/profile_privacy.html
rename : djangobb/apps/forum/templates/forum/report.html => djangobb/djangobb_forum/templates/forum/report.html
rename : djangobb/apps/forum/templates/forum/reputation.html => djangobb/djangobb_forum/templates/forum/reputation.html
rename : djangobb/apps/forum/templates/forum/reputation_form.html => djangobb/djangobb_forum/templates/forum/reputation_form.html
rename : djangobb/apps/forum/templates/forum/search_form.html => djangobb/djangobb_forum/templates/forum/search_form.html
rename : djangobb/apps/forum/templates/forum/search_posts.html => djangobb/djangobb_forum/templates/forum/search_posts.html
rename : djangobb/apps/forum/templates/forum/search_topics.html => djangobb/djangobb_forum/templates/forum/search_topics.html
rename : djangobb/apps/forum/templates/forum/topic.html => djangobb/djangobb_forum/templates/forum/topic.html
rename : djangobb/apps/forum/templates/forum/upload_avatar.html => djangobb/djangobb_forum/templates/forum/upload_avatar.html
rename : djangobb/apps/forum/templates/forum/user.html => djangobb/djangobb_forum/templates/forum/user.html
rename : djangobb/apps/forum/templates/forum/users.html => djangobb/djangobb_forum/templates/forum/users.html
rename : djangobb/apps/forum/templatetags/__init__.py => djangobb/djangobb_forum/templatetags/__init__.py
rename : djangobb/apps/forum/templatetags/forum_extras.py => djangobb/djangobb_forum/templatetags/forum_extras.py
rename : djangobb/apps/forum/tests/__init__.py => djangobb/djangobb_forum/tests/__init__.py
rename : djangobb/apps/forum/tests/postmarkup.py => djangobb/djangobb_forum/tests/postmarkup.py
rename : djangobb/apps/forum/urls.py => djangobb/djangobb_forum/urls.py
rename : djangobb/apps/forum/util.py => djangobb/djangobb_forum/util.py
rename : djangobb/apps/forum/views.py => djangobb/djangobb_forum/views.py

.hgignore

@@ -1,6 +1,7 @@
 syntax: glob
 *.pyc
 *.pyo
+*.orig
 .pydevproject
 .project
 *.db

djangobb/djangobb_forum/admin.py

@@ -3,7 +3,7 @@ from django.contrib import admin
 from django.contrib.auth import admin as auth_admin
 from django.contrib.auth.models import User
 
-from forum.models import Category, Forum, Topic, Post, Profile, Reputation,\
+from djangobb_forum.models import Category, Forum, Topic, Post, Profile, Reputation,\
     Report, Ban
 
 

djangobb/djangobb_forum/context_processors.py

@@ -1,4 +1,4 @@
-from forum import settings
+from djangobb_forum import settings
 
 def forum_settings(context):
     return {'forum_settings': settings}

djangobb/djangobb_forum/feeds.py

@@ -4,13 +4,13 @@ from django.utils.feedgenerator import Atom1Feed
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from forum.models import Post, Topic, Forum, Category
+from djangobb_forum.models import Post, Topic, Forum, Category
 
 class ForumFeed(Feed):
     feed_type = Atom1Feed
 
     def link(self):
-        return reverse('djangobb:forum.views.index')
+        return reverse('djangobb:index')
 
     def item_guid(self, obj):
         return str(obj.id)

djangobb/djangobb_forum/forms.py

@@ -9,10 +9,10 @@ from django.db.models import Q
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 
-from forum.models import Topic, Post, Profile, Reputation, Report, PrivateMessage,\
+from djangobb_forum.models import Topic, Post, Profile, Reputation, Report, PrivateMessage,\
     Forum, Attachment, TZ_CHOICES, PRIVACY_CHOICES
-from forum.markups import mypostmarkup
+from djangobb_forum.markups import mypostmarkup
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
 
 
 

djangobb/djangobb_forum/index.py

@@ -1,6 +1,6 @@
 import djapian
 
-from forum.models import Post
+from djangobb_forum.models import Post
 
 
 class PostIndexer(djapian.Indexer):

djangobb/djangobb_forum/management/commands/unban.py

@@ -3,7 +3,7 @@ from datetime import datetime
 
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
-from forum.models import Ban
+from djangobb_forum.models import Ban
 
 
 class Command(BaseCommand):

djangobb/djangobb_forum/markups/mypostmarkup.py

@@ -1,6 +1,6 @@
 import re
 
-from forum.markups import postmarkup
+from djangobb_forum.markups import postmarkup
 
 RE_FIRST_LF = re.compile('^\s*\r?\n')
 markup = postmarkup.create(exclude=['link', 'url', 'code'], use_pygments=False)

djangobb/djangobb_forum/middleware.py

@@ -4,7 +4,7 @@ from django.core.cache import cache
 from django.utils import translation
 from django.conf import settings as global_settings
 
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
 
 class LastLoginMiddleware(object):
     def process_request(self, request):

djangobb/djangobb_forum/models.py

@@ -10,10 +10,10 @@ from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.utils.hashcompat import sha_constructor
 
-from forum.markups import mypostmarkup 
+from djangobb_forum.markups import mypostmarkup 
-from forum.fields import AutoOneToOneField, ExtendedImageField, JSONField
+from djangobb_forum.fields import AutoOneToOneField, ExtendedImageField, JSONField
-from forum.util import urlize, smiles
+from djangobb_forum.util import urlize, smiles
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
 
 TZ_CHOICES = [(float(x[0]), x[1]) for x in (
     (-12, '-12'), (-11, '-11'), (-10, '-10'), (-9.5, '-09.5'), (-9, '-09'),

djangobb/djangobb_forum/signals.py

@@ -1,8 +1,8 @@
 from datetime import datetime
 from django.db.models.signals import post_save, pre_save, post_delete
 
-from forum.subscription import notify_topic_subscribers, notify_pm_recipients
+from djangobb_forum.subscription import notify_topic_subscribers, notify_pm_recipients
-from forum.models import Topic, Post, PrivateMessage
+from djangobb_forum.models import Topic, Post, PrivateMessage
 
 def post_saved(instance, **kwargs):
     created = kwargs.get('created')

djangobb/djangobb_forum/subscription.py

@@ -3,8 +3,8 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
-from forum.util import absolute_url
+from djangobb_forum.util import absolute_url
 
 TOPIC_SUBSCRIPTION_TEXT_TEMPLATE = (u"""New reply from %(username)s to topic that you have subscribed on.
 ---
@@ -41,7 +41,7 @@ def send_mail(rec_list, subject, text, html=None):
 
 
 def notify_topic_subscribers(post):
-    from forum.models import Post
+    from djangobb_forum.models import Post
 
     topic = post.topic
     if post != topic.head:
@@ -61,7 +61,7 @@ def notify_topic_subscribers(post):
 
 def notify_pm_recipients(pm):
     if not pm.read:
-        from forum.models import PrivateMessage 
+        from djangobb_forum.models import PrivateMessage 
         subject = (u'There are new messages')
         to_email = pm.dst_user.email
         text_content = PM_RECIPIENT_TEXT_TEMPLATE % {

djangobb/djangobb_forum/templatetags/forum_extras.py

@@ -15,8 +15,8 @@ from django.utils import dateformat
 from django.utils.hashcompat import md5_constructor
 from django.contrib.humanize.templatetags.humanize import naturalday
 
-from forum.models import Forum, Topic, Post, PostTracking, PrivateMessage, Report
+from djangobb_forum.models import Forum, Topic, Post, PostTracking, PrivateMessage, Report
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
 
 register = template.Library()
 

djangobb/djangobb_forum/tests/__init__.py

@@ -3,7 +3,7 @@ The root of forum tests.
 """
 import unittest
 
-from forum.tests.postmarkup import PostmarkupTestCase
+from djangobb_forum.tests.postmarkup import PostmarkupTestCase
 
 def suite():
     cases = (PostmarkupTestCase,

djangobb/djangobb_forum/tests/postmarkup.py

@@ -1,6 +1,6 @@
 import unittest
 
-from forum.markups import mypostmarkup
+from djangobb_forum.markups import mypostmarkup
 
 class PostmarkupTestCase(unittest.TestCase):
     def setUp(self):

djangobb/djangobb_forum/urls.py

@@ -1,8 +1,8 @@
 from django.conf.urls.defaults import *
 
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
-from forum import views as forum_views
+from djangobb_forum import views as forum_views
-from forum.feeds import LastPosts, LastTopics, LastPostsOnForum,\
+from djangobb_forum.feeds import LastPosts, LastTopics, LastPostsOnForum,\
      LastPostsOnCategory, LastPostsOnTopic
 
 feeds = {

djangobb/djangobb_forum/util.py

@@ -15,7 +15,7 @@ from django.template.defaultfilters import urlize as django_urlize
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.conf import settings
 
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
 
 
 #compile smiles regexp

djangobb/djangobb_forum/views.py

@@ -13,18 +13,18 @@ from django.utils import translation
 from django.db.models import Q, F, Sum
 from django.utils.encoding import smart_str
 
-from forum.util import render_to, paged, build_form, paginate, set_language
+from djangobb_forum.util import render_to, paged, build_form, paginate, set_language
-from forum.models import Category, Forum, Topic, Post, Profile, Reputation,\
+from djangobb_forum.models import Category, Forum, Topic, Post, Profile, Reputation,\
     Report, PrivateMessage, Attachment, PostTracking
-from forum.forms import AddPostForm, EditPostForm, UserSearchForm,\
+from djangobb_forum.forms import AddPostForm, EditPostForm, UserSearchForm,\
     PostSearchForm, ReputationForm, MailToForm, EssentialsProfileForm,\
     PersonalProfileForm, MessagingProfileForm, PersonalityProfileForm,\
     DisplayProfileForm, PrivacyProfileForm, ReportForm, UploadAvatarForm, CreatePMForm
-from forum.markups import mypostmarkup
+from djangobb_forum.markups import mypostmarkup
-from forum.templatetags import forum_extras
+from djangobb_forum.templatetags import forum_extras
-from forum import settings as forum_settings
+from djangobb_forum import settings as forum_settings
-from forum.util import urlize, smiles
+from djangobb_forum.util import urlize, smiles
-from forum.index import post_indexer
+from djangobb_forum.index import post_indexer
 
 @render_to('forum/index.html')
 def index(request, full=True):
@@ -81,7 +81,6 @@ def moderate(request, forum_id):
                 'topic_id': topic_ids,
                 'TEMPLATE': 'forum/move_topic.html'
             }
-            return HttpResponseRedirect(reverse('djangobb:index'))
         elif 'delete_topics' in request.POST:
             for topic_id in topic_list:
                 topic = get_object_or_404(Topic, pk=topic_id)
@@ -530,7 +529,7 @@ def show_post(request, post_id):
 @login_required
 @render_to('forum/edit_post.html')
 def edit_post(request, post_id):
-    from forum.templatetags.forum_extras import forum_editable_by
+    from djangobb_forum.templatetags.forum_extras import forum_editable_by
 
     post = get_object_or_404(Post, pk=post_id)
     topic = post.topic
@@ -549,7 +548,7 @@ def edit_post(request, post_id):
 @render_to('forum/delete_posts.html')
 @paged('posts', forum_settings.TOPIC_PAGE_SIZE)
 def delete_posts(request, topic_id):
-    from forum.templatetags.forum_extras import forum_moderated_by
+    from djangobb_forum.templatetags.forum_extras import forum_moderated_by
 
     topic = Topic.objects.select_related().get(pk=topic_id)
 
@@ -599,7 +598,7 @@ def delete_posts(request, topic_id):
 @login_required
 @render_to('forum/move_topic.html')
 def move_topic(request):
-    from forum.templatetags.forum_extras import forum_moderated_by
+    from djangobb_forum.templatetags.forum_extras import forum_moderated_by
     first_topic = topic_ids = list(request.GET['topic_id'])
     if len(topic_ids) > 1:
         topic_ids = [topic_id for topic_id in topic_ids if topic_id != ',']
@@ -636,7 +635,7 @@ def move_topic(request):
 
 @login_required
 def stick_topic(request, topic_id):
-    from forum.templatetags.forum_extras import forum_moderated_by
+    from djangobb_forum.templatetags.forum_extras import forum_moderated_by
 
     topic = get_object_or_404(Topic, pk=topic_id)
     if forum_moderated_by(topic, request.user):
@@ -648,7 +647,7 @@ def stick_topic(request, topic_id):
 
 @login_required
 def unstick_topic(request, topic_id):
-    from forum.templatetags.forum_extras import forum_moderated_by
+    from djangobb_forum.templatetags.forum_extras import forum_moderated_by
 
     topic = get_object_or_404(Topic, pk=topic_id)
     if forum_moderated_by(topic, request.user):
@@ -691,7 +690,7 @@ def delete_post(request, post_id):
 
 @login_required
 def close_topic(request, topic_id):
-    from forum.templatetags.forum_extras import forum_moderated_by
+    from djangobb_forum.templatetags.forum_extras import forum_moderated_by
 
     topic = get_object_or_404(Topic, pk=topic_id)
     if forum_moderated_by(topic, request.user):
@@ -702,7 +701,7 @@ def close_topic(request, topic_id):
 
 @login_required
 def open_topic(request, topic_id):
-    from forum.templatetags.forum_extras import forum_moderated_by
+    from djangobb_forum.templatetags.forum_extras import forum_moderated_by
 
     topic = get_object_or_404(Topic, pk=topic_id)
     if forum_moderated_by(topic, request.user):

djangobb/settings.py

@@ -4,7 +4,6 @@ import sys
 import re
 
 PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(PROJECT_ROOT, 'apps'))
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -93,8 +92,8 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.csrf.middleware.CsrfMiddleware',
     'django_authopenid.middleware.OpenIDMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
-    'forum.middleware.LastLoginMiddleware',
+    'djangobb_forum.middleware.LastLoginMiddleware',
-    'forum.middleware.UsersOnline',
+    'djangobb_forum.middleware.UsersOnline',
 )
 
 ROOT_URLCONF = 'urls'
@@ -116,7 +115,7 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'registration',
     'django_authopenid',
-    'forum',
+    'djangobb_forum',
     'djapian',
 )
 
@@ -129,7 +128,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'django_authopenid.context_processors.authopenid',
-    'forum.context_processors.forum_settings'
+    'djangobb_forum.context_processors.forum_settings'
 )
 
 # Djapian settings

djangobb/sitemap.py

@@ -1,5 +1,5 @@
 from django.contrib.sitemaps import Sitemap
-from forum.models import Forum, Topic
+from djangobb_forum.models import Forum, Topic
 
 
 class SitemapForum(Sitemap):

djangobb/urls.py

@@ -29,7 +29,7 @@ urlpatterns = patterns('',
     
     # Apps
     (r'^forum/account/', include(authopenid_urlpatterns)),
-    (r'^forum/', include('forum.urls', namespace='djangobb')),
+    (r'^forum/', include('djangobb_forum.urls', namespace='djangobb')),
 )
 
 if (settings.DEBUG):