Centralize global code into ahmia directory

ahmia/search/views/helpers.py → ahmia/ahmia/helpers.py

@@ -7,7 +7,7 @@
 from django.template import Context, loader
 from django.core.mail import send_mail
 
-from search.models import HiddenWebsite, HiddenWebsiteDescription
+from models import HiddenWebsite, HiddenWebsiteDescription
 
 def send_abuse_report(onion_url=None):
     """Send an abuse report by email."""

ahmia/search/models.py → ahmia/ahmia/models.py

@@ -1,7 +1,7 @@
 """Models for the database of ahmia."""
+from django.db import models
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxLengthValidator, MinLengthValidator
-from django.db import models
 
 def validate_onion_url(url):
     """ Test is url correct onion URL."""

ahmia/ahmia/settings.py

@@ -88,11 +88,11 @@
 # calendars according to the current locale
 USE_L10N = True
 
-STATIC_URL = '/media/'
+STATIC_URL = '/static/'
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-STATIC_ROOT = os.path.join(PROJECT_HOME, 'search/static/')
+STATIC_ROOT = os.path.join(PROJECT_HOME, 'static/')
 
 # List of finder classes that know how to find static files in
 # various locations.
@@ -113,14 +113,15 @@
 ROOT_URLCONF = 'ahmia.urls'
 
 TEMPLATE_DIRS = (
-    os.path.join(PROJECT_HOME, 'search/templates'),
+    os.path.join(PROJECT_HOME, 'ahmia/templates'),
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sites',
     'django.contrib.staticfiles',
+    'ahmia',
     #'debug_toolbar',
-    'search'
+    #'search'
 )