moved applications in their right place

announcements/views.py → apps/announcements/views.py

@@ -1,7 +1,7 @@
-from django.shortcuts import render
 from django.http import HttpResponse, Http404
-from shamsi.templatetags.shamsi_template_tags import pdatetime
+from django.shortcuts import render
 
+from vendor.shamsi.templatetags import pdatetime
 from .models import Announcement
 
 

base/models.py → apps/base/models.py

@@ -33,5 +33,5 @@ class Member(AbstractUser):
     password_changed = models.BooleanField(default=False)
 
     def has_voted(self, poll):
-        from poll.models import Vote
+        from apps.poll import Vote
         return Vote.objects.filter(member=self, choice__poll=poll).exists()

base/views.py → apps/base/views.py

@@ -1,21 +1,20 @@
+from announcements.models import Announcement
+from base.forms import *
+from base.models import Member
 from django.contrib.auth import login as dj_login
 from django.contrib.auth import logout as dj_logout
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.hashers import make_password
 from django.contrib.sites.requests import RequestSite
 from django.core.exceptions import PermissionDenied
 from django.core.mail import EmailMessage
+from django.core.mail import EmailMessage
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, redirect
 from django.template import loader
 
-from base.forms import *
-from base.models import Member
-from announcements.models import Announcement
-from shamsi.templatetags.shamsi_template_tags import pdatetime
-
-from django.core.mail import EmailMessage
+from vendor.shamsi.templatetags import pdatetime
 
 
 def home(request):

poll/admin.py → apps/poll/admin.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 from django.contrib import admin
 
-from poll.models import PollChoice, Poll, Vote
+from apps.poll import PollChoice, Poll, Vote
 
 
 class PollChoiceInline(admin.StackedInline):

poll/views.py → apps/poll/views.py

@@ -5,7 +5,7 @@
 from django.http import Http404, HttpResponse
 from django.shortcuts import render, get_object_or_404
 
-from poll.models import Poll, PollChoice, Vote
+from apps.poll import Poll, PollChoice, Vote
 
 
 def all_polls(request):

shora/settings.py

@@ -42,17 +42,19 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
 
+    # vendor plugins
     'password_reset',
-    'shamsi',
+    'vendor.shamsi',
     'tinymce',
 
-    'base',
-    'course',
-    'objection',
-    'issue',
-    'poll',
-    'event',
-    'announcements',
+    # website apps
+    'apps.base',
+    'apps.course',
+    'apps.objection',
+    'apps.issue',
+    'apps.poll',
+    'apps.event',
+    'apps.announcements',
 )
 
 MIDDLEWARE_CLASSES = (