diff --git a/pinry/core/context_processors.py b/pinry/core/context_processors.py index e48b060..ab3726e 100644 --- a/pinry/core/context_processors.py +++ b/pinry/core/context_processors.py @@ -3,6 +3,7 @@ from django.conf import settings def template_settings(request): return { - 'site_name': settings.SITE_NAME, + 'SITE_NAME': settings.SITE_NAME, + 'API_LIMIT_PER_PAGE': settings.API_LIMIT_PER_PAGE, } diff --git a/pinry/core/static/core/img/background.png b/pinry/core/static/core/img/background.png deleted file mode 100644 index b10ad70..0000000 Binary files a/pinry/core/static/core/img/background.png and /dev/null differ diff --git a/pinry/settings/__init__.py b/pinry/settings/__init__.py index d6fac46..82bc9a7 100644 --- a/pinry/settings/__init__.py +++ b/pinry/settings/__init__.py @@ -21,10 +21,14 @@ USE_I18N = True USE_L10N = True USE_TZ = True -MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/') + MEDIA_URL = '/media/' -STATIC_ROOT = os.path.join(SITE_ROOT, 'static/') STATIC_URL = '/static/' +MEDIA_ROOT = os.path.join(SITE_ROOT, 'media') +STATIC_ROOT = os.path.join(SITE_ROOT, 'static') +TEMPLATE_DIRS = [os.path.join(SITE_ROOT, 'pinry/templates')] +STATICFILES_DIRS = [os.path.join(SITE_ROOT, 'pinry/static')] + STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', @@ -43,15 +47,20 @@ MIDDLEWARE_CLASSES = ( 'pinry.core.middleware.Public', ) TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.core.context_processors.request", - "django.contrib.messages.context_processors.messages", - "pinry.core.context_processors.template_settings", + 'django.contrib.auth.context_processors.auth', + 'django.core.context_processors.debug', + 'django.core.context_processors.i18n', + 'django.core.context_processors.media', + 'django.core.context_processors.static', + 'django.core.context_processors.request', + 'django.contrib.messages.context_processors.messages', + 'pinry.core.context_processors.template_settings', ) +AUTHENTICATION_BACKENDS = ( + 'pinry.core.auth.backends.CombinedAuthBackend', + 'django.contrib.auth.backends.ModelBackend', +) + COMPRESS_CSS_FILTERS = ['compressor.filters.cssmin.CSSMinFilter'] ROOT_URLCONF = 'pinry.urls' @@ -65,6 +74,7 @@ MESSAGE_TAGS = { } API_LIMIT_PER_PAGE = 30 + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', @@ -74,10 +84,7 @@ INSTALLED_APPS = ( 'south', 'compressor', 'taggit', - 'pinry.vendor', 'pinry.core', 'pinry.pins', 'pinry.api', ) - -AUTHENTICATION_BACKENDS = ('pinry.core.auth.backends.CombinedAuthBackend', 'django.contrib.auth.backends.ModelBackend',) \ No newline at end of file diff --git a/pinry/core/static/core/css/pinry.css b/pinry/static/css/pinry.css similarity index 100% rename from pinry/core/static/core/css/pinry.css rename to pinry/static/css/pinry.css diff --git a/pinry/core/static/core/img/loader.gif b/pinry/static/img/loader.gif similarity index 100% rename from pinry/core/static/core/img/loader.gif rename to pinry/static/img/loader.gif diff --git a/pinry/core/static/core/js/messages.js b/pinry/static/js/messages.js similarity index 100% rename from pinry/core/static/core/js/messages.js rename to pinry/static/js/messages.js diff --git a/pinry/core/static/core/js/pinry.js b/pinry/static/js/pinry.js similarity index 98% rename from pinry/core/static/core/js/pinry.js rename to pinry/static/js/pinry.js index 8244db6..67c0a32 100644 --- a/pinry/core/static/core/js/pinry.js +++ b/pinry/static/js/pinry.js @@ -87,7 +87,7 @@ $(window).load(function() { }); // Up our offset, it's currently defined as 30 in our settings - offset += 30; + offset += apiLimitPerPage; }); } diff --git a/pinry/core/templates/404.html b/pinry/templates/404.html similarity index 100% rename from pinry/core/templates/404.html rename to pinry/templates/404.html diff --git a/pinry/core/templates/500.html b/pinry/templates/500.html similarity index 100% rename from pinry/core/templates/500.html rename to pinry/templates/500.html diff --git a/pinry/core/templates/core/base.html b/pinry/templates/core/base.html similarity index 62% rename from pinry/core/templates/core/base.html rename to pinry/templates/core/base.html index 4d7e14b..d900381 100644 --- a/pinry/core/templates/core/base.html +++ b/pinry/templates/core/base.html @@ -1,25 +1,21 @@ {% spaceless %} -{% load new_pin %} -{% load compress %} +{% load compress new_pin %} - {{ site_name }} - {% block title %}{% endblock %} + {{ SITE_NAME }} - {% block title %}{% endblock %} + {% compress css %} - - - - + {% endcompress %} -